summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-11-25 13:51:47 -0800
committerBharat Mediratta <bharat@menalto.com>2009-11-25 13:51:47 -0800
commite105d1fdb49ed9bbe5f20477fac77dfe63d5844d (patch)
tree6fd85bfcb5cbcd3371f25ae9334cb8af0ea042a3 /modules
parent4a417708f00b1ebd5865c8075bb36b7fc0f14756 (diff)
parentce183e5a698cf0611a68d11fad5a490a91aa9350 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/config/routes.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/gallery/config/routes.php b/modules/gallery/config/routes.php
index 0272ca15..503d6f5b 100644
--- a/modules/gallery/config/routes.php
+++ b/modules/gallery/config/routes.php
@@ -18,13 +18,10 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
-// The abstract REST_Controller is not directly routable.
-$config["^rest\b.*"] = null;
-
// Admin controllers are not available, except via /admin
$config["^admin_.*"] = null;
-// Redirect /form/add and /form/edit to REST_Controller.
+// Redirect /form/add and /form/edit to the module/form_(add|edit)/parms.
$config["^form/(edit|add)/(\w+)/(.*)$"] = "$2/form_$1/$3";
// Default page is the root album