Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

This reverts commit e88a2bc.
  • Loading branch information...
commit 43b37cd6088249e016fff0b71f1877fe0423d64a 1 parent e88a2bc
@AD7six AD7six authored
View
4 lib/Cake/Core/CakePlugin.php
@@ -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] = rtrim($config, DS) . DS;
+ self::$_plugins[$plugin] = $config;
}
if (empty(self::$_plugins[$plugin]['path'])) {
View
2  lib/Cake/View/Errors/missing_component.ctp
@@ -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 . 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>
<pre>
&lt;?php
Please sign in to comment.
Something went wrong with that request. Please try again.