Permalink
Browse files

actually, just ensure the path is slash terminated

that way we're all good
  • Loading branch information...
1 parent 72a36a0 commit e88a2bcdbb2ce77f151d57938eca9f869231d864 @AD7six AD7six committed Jun 7, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 lib/Cake/Core/CakePlugin.php
  2. +1 −1 lib/Cake/View/Errors/missing_component.ctp
@@ -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.
*
* @package Cake.Core
@@ -90,7 +90,7 @@ public static function load($plugin, $config = array()) {
}
}
} else {
- self::$_plugins[$plugin] = $config;
+ self::$_plugins[$plugin] = rtrim($config, DS) . DS;
}
if (empty(self::$_plugins[$plugin]['path'])) {
@@ -24,7 +24,7 @@ $pluginDot = empty($plugin) ? null : $plugin . '.';
</p>
<p class="error">
<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 : CakePlugin::path($plugin)) . DS . '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 . DS : CakePlugin::path($plugin)) . 'Controller' . DS . 'Component' . DS . $class . '.php'); ?>
</p>
<pre>
&lt;?php

0 comments on commit e88a2bc

Please sign in to comment.