summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-01-27 21:42:13 -0800
committerBrion Vibber <brion@pobox.com>2010-01-27 21:42:13 -0800
commit7347381183bfee96db8b2f89a4ba0ce5d04f76e2 (patch)
treec6e2cfbe8724dad0326206c71064d98afe760c15
parent794fe16d691b61ef06df6bca0a580460eafa4931 (diff)
Fix for Mapstraction plugin's zoomed map links
Move definition of NICKNAME_FMT above plugin initialization but below loading of Validate package. A merge error when refactoring setup lead to this not being defined yet when plugins were initialized, causing the router setup in MapstractionPlugin which tried to use this constant to fail. Result was bogus links and if you hit the URL directly the action would be "unrecognized".
-rw-r--r--lib/common.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/common.php b/lib/common.php
index b4e4a653c..b482464aa 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -115,6 +115,10 @@ function __autoload($cls)
require_once 'Validate.php';
require_once 'markdown.php';
+// XXX: other formats here
+
+define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
+
require_once INSTALLDIR.'/lib/util.php';
require_once INSTALLDIR.'/lib/action.php';
require_once INSTALLDIR.'/lib/mail.php';
@@ -136,6 +140,3 @@ try {
exit;
}
-// XXX: other formats here
-
-define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);