From 9ac31a6123b07818448a0927c3b1bfe11c46ed09 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 13 Jan 2012 06:37:00 -0500
Subject: [PATCH] - Fix wrong variable name in rcube_ldap.php (#1488302)
---
CHANGELOG | 1 +
program/include/rcube_ldap.php | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index a00f510..44b78af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix wrong variable name in rcube_ldap.php (#1488302)
- Make mime type detection based on filename extension to be case-insensitive
- Fix failure on MySQL database upgrade from 0.7 - text column can't have default value (#1488300)
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 65ec463..978c4e7 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -1234,9 +1234,9 @@
$attrs, 0, (int)$this->prop['sizelimit'], (int)$this->prop['timelimit'])
) {
$entries_count = ldap_count_entries($this->conn, $this->ldap_result);
- $this->_debug("S: $count_entries record(s)");
+ $this->_debug("S: $entries_count record(s)");
- return $count ? $count_entries : true;
+ return $count ? $entries_count : true;
}
else {
$this->_debug("S: ".ldap_error($this->conn));
--
Gitblit v1.9.1