From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Tue, 9 Mar 2010 17:32:22 +0000 (-0500)
Subject: Need to case Horde_Themes::img() results to string when serializing to json
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0ab23f86150e79dec6937a7e387fae90e2f6afdb;p=horde.git

Need to case Horde_Themes::img() results to string when serializing to json
---

diff --git a/framework/Ajax/lib/Horde/Ajax/Imple/AutoCompleter.php b/framework/Ajax/lib/Horde/Ajax/Imple/AutoCompleter.php
index 765b10ca2..526fd9c50 100644
--- a/framework/Ajax/lib/Horde/Ajax/Imple/AutoCompleter.php
+++ b/framework/Ajax/lib/Horde/Ajax/Imple/AutoCompleter.php
@@ -61,7 +61,7 @@ abstract class Horde_Ajax_Imple_AutoCompleter extends Horde_Ajax_Imple_Base
                 'boxClass' => 'hordeACBox kronolithLongField',
                 'trigger' => $this->_params['triggerId'],
                 'uri' => (string)$this->_getUrl($config['pretty'], $GLOBALS['registry']->getApp()),
-                'URI_IMG_HORDE' => Horde_Themes::img(null, 'horde'),
+                'URI_IMG_HORDE' => (string)Horde_Themes::img(null, 'horde'),
                 'box' => !empty($this->_params['box']) ? $this->_params['box'] : ''
             ), $config['params']);
 
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index e0bcbbea7..5f662de4f 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -121,7 +121,7 @@ class Kronolith
                 $language = 'en-US';
             }
             $params['conf'] = array(
-                'URI_IMG_HORDE' => Horde_Themes::img(null, 'horde') . '/',
+                'URI_IMG_HORDE' => (string)Horde_Themes::img(null, 'horde') . '/',
                 'useMarkerLayer' => true,
                 'language' => $language);
 
@@ -185,7 +185,7 @@ class Kronolith
         /* Variables used in core javascript files. */
         $code['conf'] = array(
             'URI_AJAX' => (string)Horde::getServiceLink('ajax', 'kronolith'),
-            'URI_IMG' => Horde_Themes::img() . '/',
+            'URI_IMG' => (string)Horde_Themes::img() . '/',
             'URI_SNOOZE' => (string)Horde::url($registry->get('webroot', 'horde') . '/services/snooze.php', true, -1),
             'URI_CALENDAR_EXPORT' => (string)Horde::url('data.php', true)->add(array('actionID' => 'export', 'all_events' => 1, 'exportID' => Horde_Data::EXPORT_ICALENDAR, 'exportCal' => '')),
             'URI_EVENT_EXPORT' => str_replace(array('%23', '%7B', '%7D'), array('#', '{', '}'), Horde::url('event.php', true)->add(array('view' => 'ExportEvent', 'eventID' => '#{id}', 'calendar' => '#{calendar}', 'type' => '#{type}'))),