Merge branch 'master' of git@gitorious.org:statusnet/mainline

This commit is contained in:
Zach Copley 2010-03-09 11:07:42 +00:00
commit d644f4148b

View File

@ -192,7 +192,7 @@ class HubSub extends Memcached_DataObject
// Any existing query string parameters must be preserved
$url = $this->callback;
if (strpos('?', $url) !== false) {
if (strpos($url, '?') !== false) {
$url .= '&';
} else {
$url .= '?';