diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php index dbc06097981..b7f5c5903f9 100644 --- a/cake/console/libs/tasks/view.php +++ b/cake/console/libs/tasks/view.php @@ -440,7 +440,7 @@ public function help() { $this->out("\tWill read the given controller for methods"); $this->out("\tand bake corresponding views."); $this->out("\tUsing the -admin flag will only bake views for actions"); - $this->out("\tthat begin with Routing.admin."); + $this->out("\tthat begin with Routing.prefixes."); $this->out("\tIf var scaffold is found it will bake the CRUD actions"); $this->out("\t(index,view,add,edit)"); $this->out(); diff --git a/cake/console/templates/skel/config/core.php b/cake/console/templates/skel/config/core.php index d1105b1a246..33fbf4ad907 100644 --- a/cake/console/templates/skel/config/core.php +++ b/cake/console/templates/skel/config/core.php @@ -69,19 +69,6 @@ */ //Configure::write('App.baseUrl', env('SCRIPT_NAME')); -/** - * Uncomment the define below to use CakePHP admin routes. - * - * The value of the define determines the name of the route - * and its associated controller actions: - * - * 'admin' -> admin_index() and /admin/controller/index - * 'superuser' -> superuser_index() and /superuser/controller/index - * - * [Note Routing.admin is deprecated in 1.3. Use Routing.prefixes instead] - */ - //Configure::write('Routing.admin', 'admin'); - /** * Uncomment the define below to use CakePHP prefix routes. * diff --git a/cake/libs/router.php b/cake/libs/router.php index 680a9231606..87d911fcdc9 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -168,12 +168,10 @@ function __construct() { } /** - * Sets the Routing prefixes. Includes compatibilty for existing Routing.admin - * configurations. + * Sets the Routing prefixes. * * @return void * @access private - * @todo Remove support for Routing.admin in future versions. */ function __setPrefixes() { $routing = Configure::read('Routing'); diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php index f077a91138e..29b3c4dc383 100644 --- a/cake/tests/cases/libs/controller/components/auth.test.php +++ b/cake/tests/cases/libs/controller/components/auth.test.php @@ -1467,8 +1467,8 @@ function testAjaxLogin() { * @return void */ function testLoginActionRedirect() { - $admin = Configure::read('Routing.admin'); - Configure::write('Routing.admin', 'admin'); + $admin = Configure::read('Routing.prefixes'); + Configure::write('Routing.prefixes', array('admin')); Router::reload(); $url = '/admin/auth_test/login'; @@ -1494,7 +1494,7 @@ function testLoginActionRedirect() { $this->assertNull($this->Controller->testUrl); - Configure::write('Routing.admin', $admin); + Configure::write('Routing.prefixes', $admin); } /** diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php index 791d8c6dd78..515673ebc5f 100644 --- a/cake/tests/cases/libs/router.test.php +++ b/cake/tests/cases/libs/router.test.php @@ -571,7 +571,6 @@ function testUrlGenerationWithAdminPrefix() { $expected = '/page/my-page'; $this->assertEqual($result, $expected); - Configure::write('Routing.admin', 'admin'); Router::reload(); Router::setRequestInfo(array( @@ -980,7 +979,7 @@ function testRouteSymmetry() { } /** - * Test that Routing.prefixes and Routing.admin are used when a Router instance is created + * Test that Routing.prefixes are used when a Router instance is created * or reset * * @return void