Fix URI map rules to restore public feed

Summary: The /public/ rule needs to come before the more general subfilter rule.

Test Plan: Hit "all", "my projects" and "public" feeds, they all work.

Reviewers: davidreuss

Reviewed By: davidreuss

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1667

src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php

@@ -34,8 +34,11 @@ class AphrontDefaultApplicationConfiguration
     return $this->getResourceURIMapRules() + array(
       '/(?:(?P<filter>jump)/)?$' =>
         'PhabricatorDirectoryMainController',
-      '/(?:(?P<filter>feed)/)(?:(?P<subfilter>[^/]+)/)?$' =>
+      '/(?:(?P<filter>feed)/)' => array(
+        'public/$' => 'PhabricatorFeedPublicStreamController',
+        '(?:(?P<subfilter>[^/]+)/)?$' =>
           'PhabricatorDirectoryMainController',
+      ),
       '/directory/' => array(
         '(?P<id>\d+)/$'
           => 'PhabricatorDirectoryCategoryViewController',
@@ -368,8 +371,6 @@ class AphrontDefaultApplicationConfiguration
           => 'PhabricatorCountdownDeleteController'
       ),
 
-      '/feed/public/$' => 'PhabricatorFeedPublicStreamController',
-
       '/V(?P<id>\d+)$'  => 'PhabricatorSlowvotePollController',
       '/vote/' => array(
         '(?:view/(?P<view>\w+)/)?$' => 'PhabricatorSlowvoteListController',