Skip to content

Commit

Permalink
Removing vestigial method in App.
Browse files Browse the repository at this point in the history
Fixing E_STRICT error in Router.
  • Loading branch information
markstory committed Nov 11, 2010
1 parent 6c2b088 commit 4e3b62e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
14 changes: 0 additions & 14 deletions cake/libs/configure.php
Expand Up @@ -863,8 +863,6 @@ public static function import($type = null, $name = null, $parent = true, $searc
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);
}
Expand Down Expand Up @@ -904,7 +902,6 @@ public static function import($type = null, $name = null, $parent = true, $searc
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);
Expand Down Expand Up @@ -1046,17 +1043,6 @@ private static function __mapped($name, $type, $plugin) {
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.
Expand Down
3 changes: 1 addition & 2 deletions cake/libs/router.php
Expand Up @@ -886,10 +886,9 @@ public static function url($url = null, $full = false) {
*
* @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'),
Expand Down

0 comments on commit 4e3b62e

Please sign in to comment.