Revert "actually, just ensure the path is slash terminated"

This reverts commit e88a2bcdbb.
This commit is contained in:
AD7six 2012-06-07 23:32:43 +02:00
parent e88a2bcdbb
commit 43b37cd608
2 changed files with 3 additions and 3 deletions

View file

@ -18,7 +18,7 @@
*/ */
/** /**
* CakePlugin is responsible for loading and unloading plugins. It also can * CakePlugin is responsible for loading and unloading plugins. It also can
* retrieve plugin paths and load their bootstrap and routes files. * retrieve plugin paths and load their bootstrap and routes files.
* *
* @package Cake.Core * @package Cake.Core
@ -90,7 +90,7 @@ class CakePlugin {
} }
} }
} else { } else {
self::$_plugins[$plugin] = rtrim($config, DS) . DS; self::$_plugins[$plugin] = $config;
} }
if (empty(self::$_plugins[$plugin]['path'])) { if (empty(self::$_plugins[$plugin]['path'])) {

View file

@ -24,7 +24,7 @@ $pluginDot = empty($plugin) ? null : $plugin . '.';
</p> </p>
<p class="error"> <p class="error">
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong> <strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Create the class %s below in file: %s', '<em>' . $class . '</em>', (empty($plugin) ? APP_DIR . DS : CakePlugin::path($plugin)) . 'Controller' . DS . 'Component' . DS . $class . '.php'); ?> <?php echo __d('cake_dev', 'Create the class %s below in file: %s', '<em>' . $class . '</em>', (empty($plugin) ? APP_DIR : CakePlugin::path($plugin)) . DS . 'Controller' . DS . 'Component' . DS . $class . '.php'); ?>
</p> </p>
<pre> <pre>
&lt;?php &lt;?php