Skip to content

Commit

Permalink
fixed hierarchy of namespace in plugin namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
zoghal committed Feb 8, 2015
1 parent ed5b3de commit 8028762
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Template/Error/missing_action.ctp
Expand Up @@ -18,7 +18,7 @@ use Cake\Core\Plugin;

$namespace = Configure::read('App.namespace');
if (!empty($plugin)) {
$namespace = $plugin;
$namespace = str_replace('/', '\\', $plugin);
}
$prefixNs = '';
if (!empty($prefix)) {
Expand Down
2 changes: 1 addition & 1 deletion src/Template/Error/missing_behavior.ctp
Expand Up @@ -17,7 +17,7 @@ use Cake\Core\Configure;

$namespace = Configure::read('App.namespace');
if (!empty($plugin)) {
$namespace = $plugin;
$namespace = str_replace('/', '\\', $plugin);
}

$pluginPath = Configure::read('App.paths.plugins.0');
Expand Down
2 changes: 1 addition & 1 deletion src/Template/Error/missing_component.ctp
Expand Up @@ -17,7 +17,7 @@ use Cake\Core\Configure;

$namespace = Configure::read('App.namespace');
if (!empty($plugin)) {
$namespace = $plugin;
$namespace = str_replace('/', '\\', $plugin);
}

$pluginPath = Configure::read('App.paths.plugins.0');
Expand Down
2 changes: 1 addition & 1 deletion src/Template/Error/missing_controller.ctp
Expand Up @@ -28,7 +28,7 @@ if (!empty($prefix)) {
}

if (!empty($plugin)) {
$namespace = $plugin;
$namespace = str_replace('/', '\\', $plugin);
}
if (empty($plugin)) {
$path = APP_DIR . DS . 'Controller' . DS . $prefixPath . h($class) . 'Controller.php' ;
Expand Down
2 changes: 1 addition & 1 deletion src/Template/Error/missing_helper.ctp
Expand Up @@ -17,7 +17,7 @@ use Cake\Core\Configure;

$namespace = Configure::read('App.namespace');
if (!empty($plugin)) {
$namespace = $plugin;
$namespace = str_replace('/', '\\', $plugin);
}

$pluginPath = Configure::read('App.paths.plugins.0');
Expand Down
2 changes: 1 addition & 1 deletion src/Template/Error/missing_view.ctp
Expand Up @@ -21,7 +21,7 @@ $pluginDot = empty($plugin) ? null : $plugin . '.';

if (empty($plugin)) {
$filePath = APP_DIR . DS;
$namespace = $plugin;
$namespace = str_replace('/', '\\', $plugin);
}
if (!empty($plugin) && Plugin::loaded($plugin)) {
$filePath = Plugin::classPath($plugin);
Expand Down

0 comments on commit 8028762

Please sign in to comment.