summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-01 11:21:50 -0500
committerEvan Prodromou <evan@status.net>2010-02-01 11:21:50 -0500
commit7390b1d1ac75876ef980face1dc3afbb7cc3ae23 (patch)
treeb7e27578ee4a2a901c33ffba30a729145adafa5c /actions
parent81087e45c5b797028e90181459e4c673cd7be278 (diff)
parent57d8f22a3ae8aba882b7782cbc426e65cdb355f6 (diff)
Merge branch 'master' into testing
Diffstat (limited to 'actions')
-rw-r--r--actions/doc.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/actions/doc.php b/actions/doc.php
index 25d363472..eaf4b7df2 100644
--- 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();