diff options
| -rw-r--r-- | data/pages/wiki/dokuwiki.txt | 4 | ||||
| -rw-r--r-- | inc/common.php | 1 | ||||
| -rw-r--r-- | lib/tpl/default/main.php | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt index ba3b429cd..cc43d2ee3 100644 --- a/data/pages/wiki/dokuwiki.txt +++ b/data/pages/wiki/dokuwiki.txt @@ -2,6 +2,8 @@ [[doku>wiki:dokuwiki|{{wiki:dokuwiki-128.png }}]] DokuWiki is a standards compliant, simple to use [[wp>Wiki]], mainly aimed at creating documentation of any kind. It is targeted at developer teams, workgroups and small companies. It has a simple but powerful [[wiki:syntax]] which makes sure the datafiles remain readable outside the Wiki and eases the creation of structured texts. All data is stored in plain text files -- no database is required. +Read the [[doku>wiki:manual|DokuWiki Manual]] to unleash the full power of DokuWiki. + ===== Download ===== DokuWiki is available at http://www.splitbrain.org/go/dokuwiki @@ -24,6 +26,8 @@ All documentation and additional information besides the [[syntax|syntax descrip * [[doku>wiki:compare|Wiki Engine Comparison]] * [[doku>wiki:experiences|Experiences]] * [[doku>wiki:tips|Tips and Tricks]] + * [[doku>wiki:tpl:templates|Templates]] and [[doku>wiki:plugins|Plugins]] + * [[doku>wiki:glossary|Glossary]] * [[http://bugs.splitbrain.org/index.php?project=1|Bugs and feature wishes]] * [[doku>wiki:mailinglist|Mailing List]] diff --git a/inc/common.php b/inc/common.php index 3b4b38ffc..353b306e6 100644 --- a/inc/common.php +++ b/inc/common.php @@ -692,6 +692,7 @@ function getRevisions($id){ */ function getGoogleQuery(){ $url = parse_url($_SERVER['HTTP_REFERER']); + if(!$url) return ''; if(!preg_match("#google\.#i",$url['host'])) return ''; $query = array(); diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index e7dd3a7d1..b3b0d5de1 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -17,7 +17,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction']?>"> <head> - <title><?php echo $ID?> [<php echo hsc($conf['title'])?>]</title> + <title><?php echo $ID?> [<?php echo hsc($conf['title'])?>]</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <?php tpl_metaheaders()?> |