Changeset d5d9680 in github

Timestamp:

Jul 26, 2010 4:11:43 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

3a4c9f4

Parents:

a954a04

Message:

• Fix double slash in plugin directory path (#1486872)

File:

• program/include/rcube_plugin_api.php (modified) (2 diffs)

program/include/rcube_plugin_api.php

@@ -78 +78 @@
     $rcmail = rcmail::get_instance();
     $this->output = $rcmail->output;
-    
+
     $plugins_dir = dir($this->dir);
+    $plugins_dir = unslashify($plugins_dir->path);
     $plugins_enabled = (array)$rcmail->config->get('plugins', array());
-    
+
     foreach ($plugins_enabled as $plugin_name) {
-      $fn = $plugins_dir->path . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
-      
+      $fn = $plugins_dir . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
+
       if (file_exists($fn)) {
         include($fn);
-        
+
         // instantiate class if exists
         if (class_exists($plugin_name, false)) {
@@ -122 +123 @@
       // load required core plugin if no derivate was found
       if (!$loaded) {
-        $fn = $plugins_dir->path . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
+        $fn = $plugins_dir . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
+
         if (file_exists($fn)) {
           include_once($fn);