diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-02-02 17:00:10 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-02-02 17:00:10 -0500 |
| commit | 057ec1fceacbfec1f755a5bc6700a188aa70e33f (patch) | |
| tree | 297839a71d9d3a7a0a7935d5dbcc9c4a3c6c99bb /lib/common.php | |
| parent | d14651706cf728f116b7ae44c6a6e37b5eb918a4 (diff) | |
| parent | f60f2c523f2e7018ea923898931287e7a99e8f44 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
lib/imqueuehandler.php
lib/jabber.php
lib/util.php
plugins/Xmpp/Sharing_XMPP.php
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/common.php b/lib/common.php index ada48b339..b95cd1175 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.0beta3'); +define('STATUSNET_VERSION', '0.9.0beta5'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Stand'); @@ -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); |