summaryrefslogtreecommitdiff
path: root/inc/parser/metadata.php
diff options
context:
space:
mode:
authorAdrian Lang <lang@cosmocode.de>2009-11-04 11:01:15 +0100
committerAdrian Lang <lang@cosmocode.de>2009-11-04 11:01:15 +0100
commitc66972f2cb89e65a8bbf8e39d42e8e479f7eb8dc (patch)
tree3d20030c333e987b42ff101ec339f2120f9f5883 /inc/parser/metadata.php
parent1378fb56f6873b93fe002e8aed001e92857b5b5c (diff)
downloadrpg-c66972f2cb89e65a8bbf8e39d42e8e479f7eb8dc.tar.gz
rpg-c66972f2cb89e65a8bbf8e39d42e8e479f7eb8dc.tar.bz2
Emit less E_NOTICEs and E_STRICTs
Changes of behaviour are: * Allow the user name, title & description \e2\80\9c0\e2\80\9d * Default to Port 443 if using HTTPS * Set $INFO['isadmin'] and $INFO['ismanager'] to \e2\80\9cfalse\e2\80\9d even if no user is logged in * Do not pass empty fragment field in the event data for event ACTION_SHOW_REDIRECT * Handle chunked encoding in HTTPClient darcs-hash:20091104100115-e4919-5cf6397d4a457e3f98a8ca49fbdab03f2147721d.gz
Diffstat (limited to 'inc/parser/metadata.php')
-rw-r--r--inc/parser/metadata.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 8aa00b4f5..c2afe8a7f 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -58,7 +58,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
// store internal info in metadata (notoc,nocache)
$this->meta['internal'] = $this->info;
- if (!$this->meta['description']['abstract']){
+ if (!isset($this->meta['description']['abstract'])){
// cut off too long abstracts
$this->doc = trim($this->doc);
if (strlen($this->doc) > 500)
@@ -91,7 +91,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
}
function header($text, $level, $pos) {
- if (!$this->meta['title']) $this->meta['title'] = $text;
+ if (!isset($this->meta['title'])) $this->meta['title'] = $text;
// add the header to the TOC
$hid = $this->_headerToLink($text,'true');
@@ -227,7 +227,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
if ($this->capture) $this->doc .= $text;
}
- function file($text){
+ function file($text, $lang = null, $file = null){
if ($this->capture){
$this->doc .= DOKU_LF.$text;
if (strlen($this->doc) > 250) $this->capture = false;
@@ -247,7 +247,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
}
}
- function code($text, $language = NULL){
+ function code($text, $language = NULL, $file = null){
if ($this->capture){
$this->doc .= DOKU_LF.$text;
if (strlen($this->doc) > 250) $this->capture = false;