diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php index 9135a6bb4..d84294cc3 100644 --- a/cake/console/libs/tasks/controller.php +++ b/cake/console/libs/tasks/controller.php @@ -469,12 +469,12 @@ class ControllerTask extends Shell { $this->out("\t(index, view, add, edit, delete)"); $this->out(); $this->out("controller admin"); - $this->out("\tbakes a controller with basic crud actions for"); - $this->out("\tConfigure::read('Routing.admin') methods."); + $this->out("\tbakes a controller with basic crud actions for one of the"); + $this->out("\tConfigure::read('Routing.prefixes') methods."); $this->out(); $this->out("controller public admin"); - $this->out("\tbakes a controller with basic crud actions for"); - $this->out("\tConfigure::read('Routing.admin') and non admin methods."); + $this->out("\tbakes a controller with basic crud actions for one"); + $this->out("\tConfigure::read('Routing.prefixes') and non admin methods."); $this->out("\t(index, view, add, edit, delete,"); $this->out("\tadmin_index, admin_view, admin_edit, admin_add, admin_delete)"); $this->out(); diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php index 03cc23d65..ec6aaf4ae 100644 --- a/cake/console/libs/tasks/project.php +++ b/cake/console/libs/tasks/project.php @@ -251,7 +251,7 @@ class ProjectTask extends Shell { } /** - * Enables Configure::read('Routing.admin') in /app/config/core.php + * Enables Configure::read('Routing.prefixes') in /app/config/core.php * * @param string $name Name to use as admin routing * @return boolean Success @@ -275,7 +275,7 @@ class ProjectTask extends Shell { } /** - * Checks for Configure::read('Routing.admin') and forces user to input it if not enabled + * Checks for Configure::read('Routing.prefixes') and forces user to input it if not enabled * * @return string Admin route to use * @access public diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php index ae761e5a9..0c10a5f51 100644 --- a/cake/tests/cases/dispatcher.test.php +++ b/cake/tests/cases/dispatcher.test.php @@ -1377,7 +1377,7 @@ class DispatcherTest extends CakeTestCase { function testAdminDispatch() { $_POST = array(); $Dispatcher =& new TestDispatcher(); - Configure::write('Routing.admin', 'admin'); + Configure::write('Routing.prefixes', array('admin')); Configure::write('App.baseUrl','/cake/repo/branches/1.2.x.x/index.php'); $url = 'admin/test_dispatch_pages/index/param:value/param2:value2'; @@ -1543,7 +1543,7 @@ class DispatcherTest extends CakeTestCase { $this->assertEqual($controller->params['controller'], $expected); - Configure::write('Routing.admin', 'admin'); + Configure::write('Routing.prefixes', array('admin')); Router::reload(); $Dispatcher =& new TestDispatcher(); diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php index 974bd1f3a..19d5853e6 100644 --- a/cake/tests/cases/libs/view/helpers/paginator.test.php +++ b/cake/tests/cases/libs/view/helpers/paginator.test.php @@ -63,7 +63,7 @@ class PaginatorHelperTest extends CakeTestCase { $this->Paginator->Ajax->Javascript =& new JavascriptHelper(); $this->Paginator->Ajax->Form =& new FormHelper(); - Configure::write('Routing.admin', ''); + Configure::write('Routing.prefixes', array()); Router::reload(); } @@ -385,7 +385,7 @@ class PaginatorHelperTest extends CakeTestCase { * @return void */ function testSortAdminLinks() { - Configure::write('Routing.admin', 'admin'); + Configure::write('Routing.prefixes', array('admin')); Router::reload(); Router::setRequestInfo(array(