From bc92ca56ef6c51393d2782b7654eaa162dfc2e10 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 30 Jul 2012 07:20:56 -0400
Subject: [PATCH] Fixes after default->classic switch

---
 program/include/rcube_addressbook.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php
index fb2027b..069ea57 100644
--- a/program/include/rcube_addressbook.php
+++ b/program/include/rcube_addressbook.php
@@ -422,7 +422,7 @@
     function get_col_values($col, $data, $flat = false)
     {
         $out = array();
-        foreach ($data as $c => $values) {
+        foreach ((array)$data as $c => $values) {
             if ($c === $col || strpos($c, $col.':') === 0) {
                 if ($flat) {
                     $out = array_merge($out, (array)$values);
@@ -448,7 +448,7 @@
      */
     protected static function normalize_string($str)
     {
-        return rcbe_utils::normalize_string($str);
+        return rcube_utils::normalize_string($str);
     }
 
     /**

--
Gitblit v1.9.1