adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing vestigial method in App.

Browse source 
Fixing E_STRICT error in Router.
This commit is contained in:
mark_story 2010-11-10 23:43:48 -05:00
parent 6c2b088706
commit 4e3b62e466
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cake/libs/configure.php
View file

@ -863,8 +863,6 @@ class App {
if ($name != null && !class_exists($name . $ext['class'])) {
if ($load = self::__mapped($name . $ext['class'], $type, $plugin)) {
if (self::__load($load)) {
self::__overload($type, $name . $ext['class'], $parent);
if (self::$return) {
return include($load);
}
@ -904,7 +902,6 @@ class App {
if ($directory !== null) {
self::$__cache = true;
self::__map($directory . $file, $name . $ext['class'], $type, $plugin);
self::__overload($type, $name . $ext['class'], $parent);
if (self::$return) {
return include($directory . $file);
@ -1046,17 +1043,6 @@ class App {
return false;
}
/**
* Used to overload objects as needed.
*
* @param string $type Model or Helper
* @param string $name Class name to overload
* @access private
*/
private static function __overload($type, $name, $parent) {
}
/**
* Loads parent classes based on $type.
* Returns a prefix or suffix needed for loading files.

3
cake/libs/router.php
View file

@ -886,10 +886,9 @@ class Router {
*
* @param array $url A url that didn't match any routes
* @return string A generated url for the array
* @access protected
* @see Router::url()
*/
function _handleNoRoute($url) {
protected static function _handleNoRoute($url) {
$named = $args = array();
$skip = array_merge(
array('bare', 'action', 'controller', 'plugin', 'prefix'),