[geeklog-cvs] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 8594:40693fcea086
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/40693fcea086
user: Rouslan Placella <rouslan at placella.com>
date: Sun Apr 15 14:19:51 2012 +0100
description:
Merged with upstream

diffstat:

 public_html/docs/history         |  2 ++
 system/classes/scripts.class.php |  4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r f0455add3e06 -r 40693fcea086 public_html/docs/history
--- a/public_html/docs/history	Sun Apr 15 14:18:32 2012 +0100
+++ b/public_html/docs/history	Sun Apr 15 14:19:51 2012 +0100
@@ -3,6 +3,8 @@
 May ??, 2012 (2.0.0)
 ------------
 
+- Fixed path issue and changed the order of loading the jQuery css files 
+  in the Scripts class (bug #0001439) [Tom]
 - Improve strength of password hashing (feature request #0001384) [Vinny]
 - Add IP Address to entries in error.log [Tom]
 - Allow markup on page navigation (feature request #0001422) [Tom]
diff -r f0455add3e06 -r 40693fcea086 system/classes/scripts.class.php
--- a/system/classes/scripts.class.php	Sun Apr 15 14:18:32 2012 +0100
+++ b/system/classes/scripts.class.php	Sun Apr 15 14:19:51 2012 +0100
@@ -129,9 +129,9 @@
         $this->jquery_ui_cdn_file = 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $version_jQuery_ui .'/jquery-ui.min.js';
         
         // Set jQuery UI CSS
-        $this->setCSSFilePrivate('jquery.ui.geeklog', $theme_path . '/jquery_ui/jquery.ui.geeklog.css', false);
         $this->setCSSFilePrivate('jquery.ui.all', $theme_path . '/jquery_ui/jquery.ui.all.css', false);
         $this->setCSSFilePrivate('jquery.ui', $theme_path . '/jquery_ui/jquery-ui.css', false);
+        $this->setCSSFilePrivate('jquery.ui.geeklog', $theme_path . '/jquery_ui/jquery.ui.geeklog.css', false);        
 
         // Set jQuery UI Core
         $names[] = 'jquery.ui.core';
@@ -194,7 +194,7 @@
                 // If name is subset of jQuery. make sure all Core UI libraries are loaded
                 if (substr($name, 0, 7) == 'jquery.' && !$this->jquery_ui_cdn) {
                     // Check that file exists, if not use Google version
-                    if (!file_exists($_CONF['path'] . 'public_html/' . $this->library_files[$name]['file'])) {
+                    if (!file_exists($_CONF['path_html'] . $this->library_files[$name]['file'])) {
                         $this->jquery_ui_cdn = true;
                         
                         $this->css_files['jquery.ui']['load'] = true;