Horde:: -> self::

diff --git a/framework/Ajax/lib/Horde/Ajax/Imple/SpellChecker.php b/framework/Ajax/lib/Horde/Ajax/Imple/SpellChecker.php
index ff514aa..8f0c69e 100644 (file)
--- a/framework/Ajax/lib/Horde/Ajax/Imple/SpellChecker.php
+++ b/framework/Ajax/lib/Horde/Ajax/Imple/SpellChecker.php
@@ -65,7 +65,7 @@ class Horde_Ajax_Imple_SpellChecker extends Horde_Ajax_Imple_Base
             'sc' => 'widget',
             'statusButton' => $this->_params['triggerId'],
             'target' => $this->_params['targetId'],
-            'url' => $this->_getUrl('SpellChecker', 'horde', array('input' => $this->_params['targetId']))
+            'url' => strval($this->_getUrl('SpellChecker', 'horde', array('input' => $this->_params['targetId'])))
         );
         if (isset($this->_params['states'])) {
             $opts['bs'] = $this->_params['states'];

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index cf1b5c1..b26af6d 100644 (file)
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1712,7 +1712,7 @@ HTML;
                     // comments.
                     $tmp = preg_replace(array('/(url\(["\']?)([^\/])/i', '/\s+/', '/\/\*.*?\*\//'), array('$1' . $path . '$2', ' ', ''), implode('', file($file['f'], $flags)));
                     if ($GLOBALS['browser']->hasFeature('dataurl')) {
-                        $tmp = preg_replace_callback('/(background(?:-image)?:[^;}]*(?:url\(["\']?))(.*?)((?:["\']?\)))/i', array('Horde', 'stylesheetCallback'), $tmp);
+                        $tmp = preg_replace_callback('/(background(?:-image)?:[^;}]*(?:url\(["\']?))(.*?)((?:["\']?\)))/i', array(self, 'stylesheetCallback'), $tmp);
                     }
                     $out .= $tmp;
                 }
@@ -1755,7 +1755,7 @@ HTML;
      */
     public function stylesheetCallback($matches)
     {
-        return $matches[1] . Horde::base64ImgData($matches[2]) . $matches[3];
+        return $matches[1] . self::base64ImgData($matches[2]) . $matches[3];
     }
 
     /**
@@ -1824,7 +1824,7 @@ HTML;
 
         foreach ($apps as $app) {
             $themes_fs = $GLOBALS['registry']->get('themesfs', $app) . '/';
-            $themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', $app), false, -1) . '/';
+            $themes_uri = self::url($GLOBALS['registry']->get('themesuri', $app), false, -1) . '/';
 
             foreach ($css_list as $css_name) {
                 $css[$themes_fs . $css_name . '.css'] = $themes_uri . $css_name . '.css';
@@ -2234,7 +2234,7 @@ HTML;
      */
     static public function popupJs($url, $options = array())
     {
-        Horde::addScriptFile('popup.js', 'horde');
+        self::addScriptFile('popup.js', 'horde');
 
         $params = new stdClass;