We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit d644f414 authored by Zach Copley's avatar Zach Copley

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

parents 7afad469 7214db14
......@@ -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 .= '?';
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment