From 29c24e647cb4c4a0928382a9ab2964980898562b Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Thu, 28 Aug 2014 13:24:03 -0400 Subject: [PATCH] Get rid of DIRECTORY_SEPARATOR for consistency --- program/lib/Roundcube/rcube_plugin_api.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php index defccc9..e0b8aea 100644 --- a/program/lib/Roundcube/rcube_plugin_api.php +++ b/program/lib/Roundcube/rcube_plugin_api.php @@ -188,8 +188,7 @@ return true; } - $fn = $plugins_dir . DIRECTORY_SEPARATOR . $plugin_name - . DIRECTORY_SEPARATOR . $plugin_name . '.php'; + $fn = "$plugins_dir/$plugin_name/$plugin_name.php"; if (is_readable($fn)) { if (!class_exists($plugin_name, false)) { @@ -279,7 +278,7 @@ ); $dir = dir($this->dir); - $fn = unslashify($dir->path) . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php'; + $fn = unslashify($dir->path) . "/$plugin_name/$plugin_name.php"; $info = false; if (!class_exists($plugin_name, false)) { -- Gitblit v1.9.1