Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  Pull GeoRSS locations over OStatus feeds
  Allow scripts/decache.php to blow out cache for objects that don't exist (anymore).
  OStatus cleanup...
  readme and version for beta5
  Delete old Twitter user record when user changes screen name instead of updating. Simpler.
  Store Twitter screen_name, not name, for foreign_user.nickname when saving Twitter user.
  Actually store the timestamp on each nonce
  OAuth app name should not be null
  Fix issue with OAuth request parameters being parsed/stored twice when
  - Fix cache handling in TwitterStatusFetcher
  Added right margin for notice text. Helps Conversation notices look
  Confirm dialog for reset OAuth consumer key and secret button
  Always check for an OAuth request. This allows OAuth clients to set an
  Linkify notice source when posting from registered OAuth apps
  Suppress notice input box on OAuth authorization page
  Better token revocation
  Allow developers to delete OAuth applications
  OAuth app names should be unique.
  Prevents app statistic text from wrapping around avatar
  Sentence case for app statistics

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 941912112..4e8b892c6 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -53,10 +53,10 @@ class OStatusPlugin extends Plugin
      */
     function onRouterInitialized($m)
     {
-        $m->connect('push/hub', array('action' => 'hub'));
+        $m->connect('main/push/hub', array('action' => 'pushhub'));
 
-        $m->connect('feedsub/callback/:feed',
-                    array('action' => 'feedsubcallback'),
+        $m->connect('main/push/callback/:feed',
+                    array('action' => 'pushcallback'),
                     array('feed' => '[0-9]+'));
         $m->connect('settings/feedsub',
                     array('action' => 'feedsubsettings'));
@@ -97,7 +97,7 @@ class OStatusPlugin extends Plugin
                 // Canonical form of id in URL?
                 // Updates will be handled for our internal PuSH hub.
                 $action->element('link', array('rel' => 'hub',
-                                               'href' => common_local_url('hub')));
+                                               'href' => common_local_url('pushhub')));
             }
         }
         return true;