From 531c4d896c6fda2e979e219633078c95b95d83c0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 16 Jan 2014 03:02:37 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/lib/Roundcube/rcube_ldap.php | 2 +-
program/lib/Roundcube/rcube_plugin.php | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 0da3e2c..de3790e 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -554,7 +554,7 @@
}
else {
$prop = $this->group_id ? $this->group_data : $this->prop;
- $base_dn = $this->group_id ? $this->group_base_dn : $this->base_dn;
+ $base_dn = $this->group_id ? $prop['base_dn'] : $this->base_dn;
// use global search filter
if (!empty($this->filter))
diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php
index 0dd575a..f0af953 100644
--- a/program/lib/Roundcube/rcube_plugin.php
+++ b/program/lib/Roundcube/rcube_plugin.php
@@ -133,15 +133,8 @@
return false;
}
else if (!$is_local) {
- $fname = $this->ID . '.inc.php';
// Search plugin_name.inc.php file in any configured path
- if (!$rcube->config->load_from_file($fname)) {
- rcube::raise_error(array(
- 'code' => 527, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Failed to load $fname config file from any configured path"), true, false);
- return false;
- }
+ return $rcube->config->load_from_file($this->ID . '.inc.php');
}
return true;
--
Gitblit v1.9.1