[mms] Fix display of Horde stylesheets not served from the local serv…

…er (i.e. via a CDN). Need to output full URLs for all stylesheets, since there is no easy way of determining which URLs are not local Conflicts: horde/docs/CHANGES horde/package.xml
horde · Sep 25, 2014 · b13bd2a · b13bd2a
1 parent aa10ecf
commit b13bd2a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
@@ -9,6 +9,18 @@ v5.3.0-git
       #13200).
 
 
+------
+v5.2.2
+------
+
+[mms] Fix display of Horde stylesheets not served from the local server (i.e.
+      via a CDN).
+[jan] Hide weather portal block if weather configuration is disabled (Bug
+      #13559).
+[jan] Add show_encryption setting to HTTP authentication configuration
+      (Jasper.Olbrich@students.uni-marburg.de, Bug #13444).
+
+
 ------
 v5.2.1
 ------

diff --git a/horde/package.xml b/horde/package.xml
@@ -3973,6 +3973,21 @@
 * [mjr] Fix removing ActiveSync device state from administrative interface when multiple user accounts exist on the same device (Bug #13336).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>5.2.2</release>
+    <api>5.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2014-07-08</date>
+   <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
+   <notes>
+* [mms] Fix display of Horde stylesheets not served from the local server (i.e. via a CDN).
+* [jan] Hide weather portal block if weather configuration is disabled (Bug #13559).
+* [jan] Add show_encryption setting to HTTP authentication configuration (Jasper.Olbrich@students.uni-marburg.de, Bug #13444).
+   </notes>
+  </release>
   <release>
    <version>
     <release>5.3.0</release>

diff --git a/horde/templates/common/header.html.php b/horde/templates/common/header.html.php
@@ -3,7 +3,7 @@
  <head>
   <?php if (extension_loaded('newrelic')) echo newrelic_get_browser_timing_header() ?>
   <?php $this->pageOutput->outputMetaTags(); ?>
-  <?php $this->pageOutput->includeStylesheetFiles($this->stylesheetOpts); ?>
+  <?php $this->pageOutput->includeStylesheetFiles($this->stylesheetOpts, true); ?>
 <?php if (!$this->minimalView): ?>
   <?php $this->pageOutput->includeFavicon(); ?>
   <?php $this->pageOutput->outputLinkTags(); ?>