From e88a2bcdbb2ce77f151d57938eca9f869231d864 Mon Sep 17 00:00:00 2001
From: AD7six
Date: Thu, 7 Jun 2012 23:29:49 +0200
Subject: [PATCH] actually, just ensure the path is slash terminated
that way we're all good
---
lib/Cake/Core/CakePlugin.php | 4 ++--
lib/Cake/View/Errors/missing_component.ctp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
index 5242c9f98..eb76e7331 100644
--- 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 @@ class CakePlugin {
}
}
} else {
- self::$_plugins[$plugin] = $config;
+ self::$_plugins[$plugin] = rtrim($config, DS) . DS;
}
if (empty(self::$_plugins[$plugin]['path'])) {
diff --git a/lib/Cake/View/Errors/missing_component.ctp b/lib/Cake/View/Errors/missing_component.ctp
index d0e6d239a..cd717b7ae 100644
--- 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 . '.';
:
- ' . $class . '', (empty($plugin) ? APP_DIR : CakePlugin::path($plugin)) . DS . 'Controller' . DS . 'Component' . DS . $class . '.php'); ?>
+ ' . $class . '', (empty($plugin) ? APP_DIR . DS : CakePlugin::path($plugin)) . 'Controller' . DS . 'Component' . DS . $class . '.php'); ?>
<?php