diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt
index ba3b429cd5f68696be4007fb14a31caefed97625..cc43d2ee38fcec779884314db290b7a593fd3386 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 3b4b38ffc2e19761d8280c0c2683da336252a538..353b306e67fe2f8020948fc0383f2f1b0688b743 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 e7dd3a7d11d4e5be2853f1a1019ccd828f70102a..b3b0d5de10e44bac81a72b2a21b8dbe3986f179c 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()?>