Revert "Output full uris for stylesheets when rendering via API"

This doesn't work as I expected.  Can't use Horde::includeStylesheetFiles() if
full urls are desired.
This reverts commit f9488bf92087ac71d7affbaa849d8d0435c98a99.

diff --git a/ansel/lib/View/EmbeddedRenderer/GalleryLink.php b/ansel/lib/View/EmbeddedRenderer/GalleryLink.php
index 7c1569a..c2e5b5c 100644 (file)
--- a/ansel/lib/View/EmbeddedRenderer/GalleryLink.php
+++ b/ansel/lib/View/EmbeddedRenderer/GalleryLink.php
@@ -88,7 +88,7 @@ class Ansel_View_EmbeddedRenderer_GalleryLink extends Ansel_View_Gallery
         Horde::includeStylesheetFiles(array(
             'nobase' => true,
             'nohorde' => true
-        ), true);
+        ));
         $css = Horde::endBuffer();
 
         /* Some paths */

diff --git a/ansel/lib/View/EmbeddedRenderer/Mini.php b/ansel/lib/View/EmbeddedRenderer/Mini.php
index c06e1d8..07d0662 100644 (file)
--- a/ansel/lib/View/EmbeddedRenderer/Mini.php
+++ b/ansel/lib/View/EmbeddedRenderer/Mini.php
@@ -97,7 +97,7 @@ class Ansel_View_EmbeddedRenderer_Mini extends Ansel_View_Gallery
         Horde::startBuffer();
         Horde::includeStylesheetFiles(array(
             'nobase' => true
-        ), true);
+        ));
         $css = Horde::endBuffer();
 
         /* Start building the javascript */

diff --git a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php
index 13b62b3..a298e1d 100644 (file)
--- a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php
+++ b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php
@@ -136,7 +136,7 @@ class Ansel_View_GalleryRenderer_GalleryLightbox extends Ansel_View_GalleryRende
         /* Output js/css here if we are calling via the api */
         if ($this->view->api) {
             $GLOBALS['injector']->getInstance('Horde_Themes_Css')->addThemeStylesheet('lightbox.css');
-            Horde::includeStylesheetFiles(array('nobase' => true), true);
+            Horde::includeStylesheetFiles(array('nobase' => true));
             $includes = $GLOBALS['injector']->createInstance('Horde_Script_Files');
             $includes->add('accesskeys.js', 'horde', true);
             $includes->add('effects.js', 'horde', true);

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 8eed794..5012fd4 100644 (file)
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1416,13 +1416,11 @@ HTML;
      *
      * @param array $opts  Options to pass to
      *                     Horde_Themes_Css::getStylesheetUrls().
-     *
-     * @param boolean $full  Output full uris.
      */
-    static public function includeStylesheetFiles(array $opts = array(), $full = false)
+    static public function includeStylesheetFiles(array $opts = array())
     {
         foreach ($GLOBALS['injector']->getInstance('Horde_Themes_Css')->getStylesheetUrls($opts) as $val) {
-            echo '<link href="' . (!$full ? $val : $val->fulluri) . '" rel="stylesheet" type="text/css" />';
+            echo '<link href="' . $val . '" rel="stylesheet" type="text/css" />';
         }
     }