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

This reverts commit e88a2bc.
cakephp · Jun 7, 2012 · 43b37cd · 43b37cd
1 parent e88a2bc
commit 43b37cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Cake/Core/CakePlugin.php b/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'])) {

diff --git a/lib/Cake/View/Errors/missing_component.ctp b/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