From fe2f0be4352ba0bc213a2c6d4dfcbbddea1a551c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 21 Aug 2012 04:50:14 -0400
Subject: [PATCH] Fix possible PHP warning, read default_folders using config->get() to support deprecated option name (default_imap_folders)
---
program/include/rcube_result_set.php | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/program/include/rcube_result_set.php b/program/include/rcube_result_set.php
index 499fb6a..809d874 100644
--- a/program/include/rcube_result_set.php
+++ b/program/include/rcube_result_set.php
@@ -4,9 +4,12 @@
+-----------------------------------------------------------------------+
| program/include/rcube_result_set.php |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2006-2010, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2006-2011, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Class representing an address directory result set |
@@ -14,14 +17,11 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
/**
- * RoundCube result set class.
+ * Roundcube result set class.
* Representing an address directory result set.
*
* @package Addressbook
@@ -31,6 +31,7 @@
var $count = 0;
var $first = 0;
var $current = 0;
+ var $searchonly = false;
var $records = array();
@@ -44,27 +45,27 @@
{
$this->records[] = $rec;
}
-
+
function iterate()
{
return $this->records[$this->current++];
}
-
+
function first()
{
$this->current = 0;
return $this->records[$this->current++];
}
-
+
// alias for iterate()
function next()
{
return $this->iterate();
}
-
+
function seek($i)
{
$this->current = $i;
}
-
+
}
--
Gitblit v1.9.1