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

2010-02-01 08:49:19 -08:00 · 2010-02-01 08:49:19 -08:00 · d9e7d4c4ad
commit d9e7d4c4ad
parent 84ab0156b4 d264db6119
1 changed files with 3 additions and 0 deletions
--- 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();