From: Jan Schneider <jan@horde.org>
Date: Fri, 12 Mar 2010 17:38:27 +0000 (+0100)
Subject: Cast image to string.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=508a445fb73741355a7fea8beb46d3eb94c97402;p=horde.git

Cast image to string.
---

diff --git a/chora/lib/Block/tree_menu.php b/chora/lib/Block/tree_menu.php
index 7f0b6ae08..d38f577ed 100644
--- a/chora/lib/Block/tree_menu.php
+++ b/chora/lib/Block/tree_menu.php
@@ -23,7 +23,7 @@ class Horde_Block_chora_tree_menu extends Horde_Block
                     false,
                     array(
                         'icon' => 'folder.png',
-                        'icondir' => Horde_Themes::img(null, 'horde') . '/tree',
+                        'icondir' => (string)Horde_Themes::img(null, 'horde') . '/tree',
                         'url' => Chora::url('browsedir', '', array('rt' => $key))
                     )
                 );
diff --git a/fima/lib/Block/tree_menu.php b/fima/lib/Block/tree_menu.php
index 2725bf171..448c19d8e 100644
--- a/fima/lib/Block/tree_menu.php
+++ b/fima/lib/Block/tree_menu.php
@@ -11,7 +11,7 @@ class Horde_Block_fima_tree_menu extends Horde_Block {
     {
         $menus = array(
             array('add', _("Add Postings"), 'add.png', Horde_Util::addParameter(Horde::applicationUrl('postings.php'), 'actionID', 'add_postings')),
-            array('search', _("Search"), 'search.png', Horde::applicationUrl('search.php'), Horde_Themes::img(null, 'horde')),
+            array('search', _("Search"), 'search.png', Horde::applicationUrl('search.php'), (string)Horde_Themes::img(null, 'horde')),
             array('accounts', _("Accounts"), 'accounts.png', Horde::applicationUrl('accounts.php')),
             array('reports', _("Reports"), 'report.png', Horde::applicationUrl('report.php')),
         );
@@ -23,7 +23,7 @@ class Horde_Block_fima_tree_menu extends Horde_Block {
                            $indent + 1,
                            false,
                            array('icon' => $menu[2],
-                                 'icondir' => isset($menu[4]) ? $menu[4] : Horde_Themes::img(),
+                                 'icondir' => isset($menu[4]) ? $menu[4] : (string)Horde_Themes::img(),
                                  'url' => $menu[3]));
         }
     }
diff --git a/gollem/lib/Block/tree_menu.php b/gollem/lib/Block/tree_menu.php
index cc145dd10..80f92be3d 100644
--- a/gollem/lib/Block/tree_menu.php
+++ b/gollem/lib/Block/tree_menu.php
@@ -23,7 +23,7 @@ class Horde_Block_gollem_tree_menu extends Horde_Block {
         // TODO
         return;
 
-        $icondir = Horde_Themes::img();
+        $icondir = (string)Horde_Themes::img();
         $login_url = Horde::applicationUrl('login.php');
 
         foreach ($GLOBALS['gollem_backends'] as $key => $val) {
diff --git a/imp/lib/Block/tree_folders.php b/imp/lib/Block/tree_folders.php
index d7c2bc864..1c1555afc 100644
--- a/imp/lib/Block/tree_folders.php
+++ b/imp/lib/Block/tree_folders.php
@@ -24,7 +24,7 @@ class Horde_Block_imp_tree_folders extends Horde_Block
         }
 
         /* Cache some additional values. */
-        $image_dir = Horde_Themes::img();
+        $image_dir = (string)Horde_Themes::img();
 
         $tree->addNode($parent . 'compose', $parent, _("New Message"),
                        $indent, false,
diff --git a/kastalia/lib/Block/tree_menu.php b/kastalia/lib/Block/tree_menu.php
index 263411870..62eeaa93f 100644
--- a/kastalia/lib/Block/tree_menu.php
+++ b/kastalia/lib/Block/tree_menu.php
@@ -29,7 +29,7 @@ class Horde_Block_kastalia_tree_menu extends Horde_Block {
                        $indent + 1,
                        false,
                        array('icon' => 'menu/upload.png',
-                             'icondir' => Horde_Themes::img(null, 'kastalia'),
+                             'icondir' => (string)Horde_Themes::img(null, 'kastalia'),
                              'url' => Horde::applicationUrl('upload_menu.php')));
     }
 
diff --git a/kronolith/lib/Block/tree_alarms.php b/kronolith/lib/Block/tree_alarms.php
index 0df12b388..d93ade496 100644
--- a/kronolith/lib/Block/tree_alarms.php
+++ b/kronolith/lib/Block/tree_alarms.php
@@ -37,7 +37,7 @@ class Horde_Block_kronolith_tree_alarms extends Horde_Block {
                                $indent + 1,
                                false,
                                array('icon' => 'alarm.png',
-                                     'icondir' => Horde_Themes::img(),
+                                     'icondir' => (string)Horde_Themes::img(),
                                      'title' => $event->getTooltip(),
                                      'url' => $event->getViewUrl()));
             }
diff --git a/kronolith/lib/Block/tree_menu.php b/kronolith/lib/Block/tree_menu.php
index 2ccc1610d..f6bf6d5b3 100644
--- a/kronolith/lib/Block/tree_menu.php
+++ b/kronolith/lib/Block/tree_menu.php
@@ -21,7 +21,7 @@ class Horde_Block_kronolith_tree_menu extends Horde_Block {
             array('week', _("Week"), 'weekview.png', Horde::applicationUrl('week.php')),
             array('month', _("Month"), 'monthview.png', Horde::applicationUrl('month.php')),
             array('year', _("Year"), 'yearview.png', Horde::applicationUrl('year.php')),
-            array('search', _("Search"), 'search.png', Horde::applicationUrl('search.php'), Horde_Themes::img(null, 'horde')),
+            array('search', _("Search"), 'search.png', Horde::applicationUrl('search.php'), (string)Horde_Themes::img(null, 'horde')),
         );
 
         foreach ($menus as $menu) {
@@ -31,7 +31,7 @@ class Horde_Block_kronolith_tree_menu extends Horde_Block {
                            $indent + 1,
                            false,
                            array('icon' => $menu[2],
-                                 'icondir' => isset($menu[4]) ? $menu[4] : Horde_Themes::img(),
+                                 'icondir' => isset($menu[4]) ? $menu[4] : (string)Horde_Themes::img(),
                                  'url' => $menu[3]));
         }
     }
diff --git a/nag/lib/Block/tree_alarms.php b/nag/lib/Block/tree_alarms.php
index e31610ce6..8bc9488e3 100644
--- a/nag/lib/Block/tree_alarms.php
+++ b/nag/lib/Block/tree_alarms.php
@@ -47,7 +47,7 @@ class Horde_Block_nag_tree_alarms extends Horde_Block {
                            $indent + 1,
                            false,
                            array('icon' => 'alarm.png',
-                                 'icondir' => Horde_Themes::img(),
+                                 'icondir' => (string)Horde_Themes::img(),
                                  'title' => $title,
                                  'url' => $url));
         }
diff --git a/nag/lib/Block/tree_menu.php b/nag/lib/Block/tree_menu.php
index db78fbe08..81c3af5a2 100644
--- a/nag/lib/Block/tree_menu.php
+++ b/nag/lib/Block/tree_menu.php
@@ -15,7 +15,7 @@ class Horde_Block_nag_tree_menu extends Horde_Block {
         global $registry;
 
         $add = Horde::applicationUrl('task.php')->add('actionID', 'add_task');
-        $icondir = Horde_Themes::img();
+        $icondir = (string)Horde_Themes::img();
 
         $tree->addNode($parent . '__new',
                        $parent,
@@ -48,7 +48,7 @@ class Horde_Block_nag_tree_menu extends Horde_Block {
                        $indent + 1,
                        false,
                        array('icon' => 'search.png',
-                             'icondir' => Horde_Themes::img(null, 'horde'),
+                             'icondir' => (string)Horde_Themes::img(null, 'horde'),
                              'url' => Horde::applicationUrl('search.php')));
     }
 
diff --git a/skoli/lib/Block/tree_menu.php b/skoli/lib/Block/tree_menu.php
index 1fbb5c84b..27bc1fd90 100644
--- a/skoli/lib/Block/tree_menu.php
+++ b/skoli/lib/Block/tree_menu.php
@@ -15,7 +15,7 @@ class Horde_Block_skoli_tree_menu extends Horde_Block {
         require_once dirname(__FILE__) . '/../base.php';
 
         $add = Horde::applicationUrl('add.php');
-        $icondir = Horde_Themes::img();
+        $icondir = (string)Horde_Themes::img();
 
         $classes = Skoli::listClasses(false, Horde_Perms::EDIT);
         if (count($classes) > 0) {
@@ -45,7 +45,7 @@ class Horde_Block_skoli_tree_menu extends Horde_Block {
                            $indent + 1,
                            false,
                            array('icon' => 'search.png',
-                                 'icondir' => Horde_Themes::img(null, 'horde'),
+                                 'icondir' => (string)Horde_Themes::img(null, 'horde'),
                                  'url' => Horde::applicationUrl('search.php')));
         }
 
diff --git a/turba/lib/Block/tree_menu.php b/turba/lib/Block/tree_menu.php
index 1335bbf9f..6e526a29a 100644
--- a/turba/lib/Block/tree_menu.php
+++ b/turba/lib/Block/tree_menu.php
@@ -16,7 +16,7 @@ class Horde_Block_turba_tree_menu extends Horde_Block {
 
         $browse = Horde::applicationUrl('browse.php');
         $add = Horde::applicationUrl('add.php');
-        $icondir = Horde_Themes::img() . '/menu';
+        $icondir = (string)Horde_Themes::img() . '/menu';
 
         if ($GLOBALS['addSources']) {
             $tree->addNode($parent . '__new',
@@ -59,7 +59,7 @@ class Horde_Block_turba_tree_menu extends Horde_Block {
                        $indent + 1,
                        false,
                        array('icon' => 'search.png',
-                             'icondir' => Horde_Themes::img(null, 'horde'),
+                             'icondir' => (string)Horde_Themes::img(null, 'horde'),
                              'url' => Horde::applicationUrl('search.php')));
     }
 
diff --git a/whups/lib/Block/tree_menu.php b/whups/lib/Block/tree_menu.php
index 2ae742d31..33dca7b83 100644
--- a/whups/lib/Block/tree_menu.php
+++ b/whups/lib/Block/tree_menu.php
@@ -20,7 +20,7 @@ class Horde_Block_whups_tree_menu extends Horde_Block {
                        $indent + 1,
                        false,
                        array('icon' => 'create.png',
-                             'icondir' => Horde_Themes::img(),
+                             'icondir' => (string)Horde_Themes::img(),
                              'url' => Horde::applicationUrl('ticket/create.php')));
 
         $tree->addNode($parent . '__search',
@@ -29,7 +29,7 @@ class Horde_Block_whups_tree_menu extends Horde_Block {
                        $indent + 1,
                        false,
                        array('icon' => 'search.png',
-                             'icondir' => Horde_Themes::img(),
+                             'icondir' => (string)Horde_Themes::img(),
                              'url' => Horde::applicationUrl('search.php')));
     }