Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updating uses of Routing.admin to be Routing.prefixes, as Routing.adm…

…in is deprecated.
  • Loading branch information...
commit 76780ab99cb3bc480ddfa0f11ef3791c36db5fd0 1 parent f8a406e
@markstory markstory authored
View
8 cake/console/libs/tasks/controller.php
@@ -469,12 +469,12 @@ function help() {
$this->out("\t(index, view, add, edit, delete)");
$this->out();
$this->out("controller <name> 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 <name> 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();
View
4 cake/console/libs/tasks/project.php
@@ -251,7 +251,7 @@ function corePath($path) {
}
/**
- * 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 @@ function cakeAdmin($name) {
}
/**
- * 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
View
4 cake/tests/cases/dispatcher.test.php
@@ -1377,7 +1377,7 @@ function testDispatchWithArray() {
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 @@ function testAutomaticPluginControllerDispatch() {
$this->assertEqual($controller->params['controller'], $expected);
- Configure::write('Routing.admin', 'admin');
+ Configure::write('Routing.prefixes', array('admin'));
Router::reload();
$Dispatcher =& new TestDispatcher();
View
4 cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -63,7 +63,7 @@ function setUp() {
$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 @@ function testSortDir() {
* @return void
*/
function testSortAdminLinks() {
- Configure::write('Routing.admin', 'admin');
+ Configure::write('Routing.prefixes', array('admin'));
Router::reload();
Router::setRequestInfo(array(
Please sign in to comment.
Something went wrong with that request. Please try again.