diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-01-14 01:50:21 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-01-14 01:50:21 +0000 |
| commit | 085406ea88efd4caaad3933871554dd30a23eba6 (patch) | |
| tree | 78828e20ad893a84060090395b06e365e7123467 /lib | |
| parent | acc48289e5f87e879e6a1182b43e405016e675d6 (diff) | |
| parent | fba840ed568222b082dbac81cd8e38217d53a7ec (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 3 | ||||
| -rw-r--r-- | lib/dbqueuemanager.php | 4 | ||||
| -rw-r--r-- | lib/util.php | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/lib/common.php b/lib/common.php index 00e80373e..243ac3e79 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.0rc2'); +define('STATUSNET_VERSION', '0.9.0rc3'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Stand'); @@ -136,7 +136,6 @@ try { exit; } - // XXX: other formats here define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER); diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php index a5c6fd28b..889365b64 100644 --- a/lib/dbqueuemanager.php +++ b/lib/dbqueuemanager.php @@ -99,8 +99,8 @@ class DBQueueManager extends QueueManager $this->_fail($notice, $queue); } } else { - $this->_log(LOG_INFO, "[$queue:notice $notice->id] No handler for queue $queue"); - $this->_fail($notice, $queue); + $this->_log(LOG_INFO, "[$queue:notice $notice->id] No handler for queue $queue; discarding."); + $this->_done($notice, $queue); } return true; } diff --git a/lib/util.php b/lib/util.php index 9255b9b37..ef8a5d1f0 100644 --- a/lib/util.php +++ b/lib/util.php @@ -173,10 +173,8 @@ function common_ensure_session() } if (array_key_exists(session_name(), $_GET)) { $id = $_GET[session_name()]; - common_log(LOG_INFO, 'Setting session from GET parameter: '.$id); } else if (array_key_exists(session_name(), $_COOKIE)) { $id = $_COOKIE[session_name()]; - common_log(LOG_INFO, 'Setting session from COOKIE: '.$id); } if (isset($id)) { session_id($id); |