Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

diff --git a/actions/doc.php b/actions/doc.php
index 25d363472a2cca2feadf3d1292c1d226c64f8bd5..eaf4b7df2d8f0b62365b718cca266ffe572ac1f8 100644 (file)
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -54,6 +54,9 @@ class DocAction extends Action
         parent::prepare($args);
 
         $this->title  = $this->trimmed('title');
+        if (!preg_match('/^[a-zA-Z0-9_-]*$/', $this->title)) {
+            $this->title = 'help';
+        }
         $this->output = null;
 
         $this->loadDoc();