adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing more shells, and updating code in home.ctp

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-12-07 20:42:50 -04:30
parent 7828f7d2fb
commit 02ad049559
7 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/Cake/Console/Command/ConsoleShell.php
View file

@ -53,7 +53,7 @@ class ConsoleShell extends Shell {
*
*/
public function initialize() {
require_once CAKE . 'dispatcher.php';
App::uses('Dispatcher', 'Routing');
$this->Dispatcher = new Dispatcher();
$this->models = App::objects('model');
App::import('Model', $this->models);
@ -335,21 +335,20 @@ class ConsoleShell extends Shell {
* @return boolean True if config reload was a success, otherwise false
*/
protected function _loadRoutes() {
$router = Router::getInstance();
$router->reload();
extract($router->getNamedExpressions());
Router::reload();
extract(Router::getNamedExpressions());
if (!@include(CONFIGS . 'routes.php')) {
return false;
}
$router->parse('/');
Router::parse('/');
foreach (array_keys($router->getNamedExpressions()) as $var) {
foreach (array_keys(Router::getNamedExpressions()) as $var) {
unset(${$var});
}
for ($i = 0, $len = count($router->routes); $i < $len; $i++) {
$router->routes[$i]->compile();
foreach (Router::$routes as $route) {
$route->compile();
}
return true;
}

4
lib/Cake/Console/Command/SchemaShell.php
View file

@ -20,8 +20,8 @@
* @since CakePHP(tm) v 1.2.0.5550
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('Core', 'File', false);
App::import('Model', 'CakeSchema', false);
App::uses('File', 'Utility');
App::uses('CakeSchema', 'Model');
/**
* Schema is a command-line database management utility for automating programmer chores.

1
lib/Cake/Console/ConsoleOptionParser.php
View file

@ -23,6 +23,7 @@ App::uses('ConsoleInput', 'Console');
App::uses('ConsoleInputOption', 'Console');
App::uses('ConsoleInputArgument', 'Console');
App::uses('ConsoleOptionParser', 'Console');
App::uses('HelpFormatter', 'Console');
/**
* Handles parsing the ARGV in the command line and provides support

2
lib/Cake/Console/HelpFormatter.php
View file

@ -17,7 +17,7 @@
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('String', 'Utility');
App::uses('String', 'Utility');
/**
* HelpFormatter formats help for console shells. Can format to either

5
lib/Cake/Model/CakeSchema.php
View file

@ -17,8 +17,9 @@
* @since CakePHP(tm) v 1.2.0.5550
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::uses('Model', 'Core');
App::uses('ConnectionManager', 'Core');
App::uses('Model', 'Model');
App::uses('AppModel', 'Model');
App::uses('ConnectionManager', 'Model');
/**
* Base Class for Schema management

2
lib/Cake/Utility/File.php
View file

@ -22,7 +22,7 @@
* Included libraries.
*
*/
App::uses('File', 'Utility');
App::uses('Folder', 'Utility');
/**
* Convenience class for reading, writing and appending to files.

4
lib/Cake/View/pages/home.ctp
View file

@ -16,14 +16,14 @@
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
if (Configure::read() == 0):
if (Configure::read('debug') == 0):
throw new NotFoundException();
endif;
?>
<h2><?php echo __('Release Notes for CakePHP %s.', Configure::version()); ?></h2>
<a href="http://cakephp.org/changelogs/1.3.6"><?php __('Read the changelog'); ?> </a>
<?php
if (Configure::read() > 0):
if (Configure::read('debug') > 0):
Debugger::checkSecurityKeys();
endif;
?>