Gantry 4 Framework - Version 4.0.4

Version Description

  • Fixed a bug introduced in 4.0.3 where CSS files could load with double slashes
Download this release

Release Info

Developer gantry
Plugin Icon 128x128 Gantry 4 Framework
Version 4.0.4
Comparing to
See all releases

Code changes from version 4.0.3 to 4.0.4

Files changed (12) hide show
  1. CHANGELOG.php +4 -1
  2. admin/forms/fields/imagepicker.php +1 -1
  3. admin/forms/fields/updater.php +1 -1
  4. admin/widgets/colorchooser/css/mooRainbow-2.0.css +1 -1
  5. core/gantry.class.php +8 -9
  6. core/utilities/gantrycache.class.php +2 -2
  7. functions.php +1 -1
  8. gantry.php +1 -1
  9. readme.txt +7 -1
  10. widgets/breadcrumbs.php +1 -1
  11. widgets/loginbutton.php +1 -1
  12. widgets/loginform.php +1 -1
CHANGELOG.php CHANGED
@@ -2,7 +2,7 @@
2
  /**
3
  * Gantry For Wordpress
4
  *
5
- * @version $Id: CHANGELOG.php 59441 2013-03-22 21:42:59Z jakub $
6
  * @author RocketTheme http://www.rockettheme.com
7
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
8
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
@@ -27,6 +27,9 @@ Legend:
27
  - -> Removed
28
  ! -> Note
29
 
 
 
 
30
  ------- 4.0.3 Release [] ------
31
  # Fixed compatibility with WordPress Multi Site installations
32
  # Fixed a notice where siteurl option didn't had path set
2
  /**
3
  * Gantry For Wordpress
4
  *
5
+ * @version $Id: CHANGELOG.php 59447 2013-03-22 23:08:26Z jakub $
6
  * @author RocketTheme http://www.rockettheme.com
7
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
8
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
27
  - -> Removed
28
  ! -> Note
29
 
30
+ ------- 4.0.4 Release [] ------
31
+ # Fixed a bug introduced in 4.0.3 where CSS files could load with double slashes
32
+
33
  ------- 4.0.3 Release [] ------
34
  # Fixed compatibility with WordPress Multi Site installations
35
  # Fixed a notice where siteurl option didn't had path set
admin/forms/fields/imagepicker.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 4.0.3 March 22, 2013
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
1
  <?php
2
  /**
3
+ * @version 4.0.4 March 22, 2013
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
admin/forms/fields/updater.php CHANGED
@@ -27,7 +27,7 @@ class GantryFormFieldUpdater extends GantryFormField
27
 
28
  $currentVersion = GANTRY_VERSION;
29
 
30
- if ($currentVersion == "\4.0.3") $currentVersion = "[DEV]";
31
 
32
  // curl check
33
  if (!function_exists('curl_version')) {
27
 
28
  $currentVersion = GANTRY_VERSION;
29
 
30
+ if ($currentVersion == "\4.0.4") $currentVersion = "[DEV]";
31
 
32
  // curl check
33
  if (!function_exists('curl_version')) {
admin/widgets/colorchooser/css/mooRainbow-2.0.css CHANGED
@@ -1,5 +1,5 @@
1
  /**
2
- * @version 4.0.3 March 22, 2013
3
  * @author RocketTheme http://www.rockettheme.com
4
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
5
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
1
  /**
2
+ * @version 4.0.4 March 22, 2013
3
  * @author RocketTheme http://www.rockettheme.com
4
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
5
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
core/gantry.class.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version $Id: gantry.class.php 59439 2013-03-22 21:16:00Z btowles $
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
@@ -276,7 +276,7 @@ class Gantry
276
  $urlinfo = parse_url(get_bloginfo('template_url'));
277
  $this->templateUrl = $urlinfo["path"];
278
  $this->templateUrl = isset($urlinfo["path"]) ? rtrim($urlinfo["path"],'/') : '';
279
- $this->templateUrl .= "/";
280
 
281
  $this->uriutil = new Gantry_Uri_Util(Gantry_Uri_Util::cleanFilesystemPath(ABSPATH),get_option('siteurl'));
282
 
@@ -374,7 +374,6 @@ class Gantry
374
  $urlinfo = parse_url(get_bloginfo('template_url'));
375
  $this->templateUrl = $urlinfo["path"];
376
  $this->templateUrl = isset($urlinfo["path"]) ? rtrim($urlinfo["path"],'/') : '';
377
- $this->templateUrl .= "/";
378
 
379
 
380
  $this->_initContentTypePaths();
@@ -1045,7 +1044,7 @@ class Gantry
1045
  $path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1046
  }
1047
  $filename = strtolower(basename($path, '.css')) . rand(0, 1000);
1048
- wp_enqueue_style($filename, $path, array(), '4.0.3');
1049
  $deps[] = $path;
1050
  }
1051
  }
@@ -1058,11 +1057,11 @@ class Gantry
1058
  if ($this->baseUrl != "/") {
1059
  $path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1060
  }
1061
- wp_enqueue_script($path, $path, $deps, '4.0.3');
1062
  $deps[] = $path;
1063
  }
1064
  foreach ($this->_full_scripts as $strSrc) {
1065
- wp_enqueue_script($strSrc, $strSrc, $deps, '4.0.3');
1066
  $deps[] = $strSrc;
1067
  }
1068
 
@@ -1630,7 +1629,7 @@ class Gantry
1630
  if (!defined('GANTRY_FINALIZED')) {
1631
  $this->_styles[$priority][] = $link;
1632
  } else {
1633
- wp_enqueue_style($link->getUrl(), $link->getUrl(), array(), '4.0.3');
1634
  }
1635
  }
1636
  }
@@ -1734,7 +1733,7 @@ class Gantry
1734
  if (!defined('GANTRY_FINALIZED')) {
1735
  $this->_scripts[$full_path] = $check_url_path . $query_string;
1736
  } else {
1737
- wp_enqueue_script($check_url_path, $check_url_path, array(), '4.0.3');
1738
  }
1739
  break;
1740
  }
@@ -1768,7 +1767,7 @@ class Gantry
1768
  if (!defined('GANTRY_FINALIZED')) {
1769
  $this->_scripts[$check_path] = $check_url_path . $query_string;
1770
  } else {
1771
- wp_enqueue_script($check_url_path, $check_url_path, array(), '4.0.3');
1772
  }
1773
  break(2);
1774
  }
1
  <?php
2
  /**
3
+ * @version $Id: gantry.class.php 59446 2013-03-22 22:53:05Z btowles $
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
276
  $urlinfo = parse_url(get_bloginfo('template_url'));
277
  $this->templateUrl = $urlinfo["path"];
278
  $this->templateUrl = isset($urlinfo["path"]) ? rtrim($urlinfo["path"],'/') : '';
279
+
280
 
281
  $this->uriutil = new Gantry_Uri_Util(Gantry_Uri_Util::cleanFilesystemPath(ABSPATH),get_option('siteurl'));
282
 
374
  $urlinfo = parse_url(get_bloginfo('template_url'));
375
  $this->templateUrl = $urlinfo["path"];
376
  $this->templateUrl = isset($urlinfo["path"]) ? rtrim($urlinfo["path"],'/') : '';
 
377
 
378
 
379
  $this->_initContentTypePaths();
1044
  $path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1045
  }
1046
  $filename = strtolower(basename($path, '.css')) . rand(0, 1000);
1047
+ wp_enqueue_style($filename, $path, array(), '4.0.4');
1048
  $deps[] = $path;
1049
  }
1050
  }
1057
  if ($this->baseUrl != "/") {
1058
  $path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1059
  }
1060
+ wp_enqueue_script($path, $path, $deps, '4.0.4');
1061
  $deps[] = $path;
1062
  }
1063
  foreach ($this->_full_scripts as $strSrc) {
1064
+ wp_enqueue_script($strSrc, $strSrc, $deps, '4.0.4');
1065
  $deps[] = $strSrc;
1066
  }
1067
 
1629
  if (!defined('GANTRY_FINALIZED')) {
1630
  $this->_styles[$priority][] = $link;
1631
  } else {
1632
+ wp_enqueue_style($link->getUrl(), $link->getUrl(), array(), '4.0.4');
1633
  }
1634
  }
1635
  }
1733
  if (!defined('GANTRY_FINALIZED')) {
1734
  $this->_scripts[$full_path] = $check_url_path . $query_string;
1735
  } else {
1736
+ wp_enqueue_script($check_url_path, $check_url_path, array(), '4.0.4');
1737
  }
1738
  break;
1739
  }
1767
  if (!defined('GANTRY_FINALIZED')) {
1768
  $this->_scripts[$check_path] = $check_url_path . $query_string;
1769
  } else {
1770
+ wp_enqueue_script($check_url_path, $check_url_path, array(), '4.0.4');
1771
  }
1772
  break(2);
1773
  }
core/utilities/gantrycache.class.php CHANGED
@@ -26,7 +26,7 @@ class GantryCache
26
  /**
27
  *
28
  */
29
- const ADMIN_GROUP_NAME = 'GantryAdmin-4.0.3';
30
 
31
  const ADMIN_LIFETIME = 86400;
32
 
@@ -122,7 +122,7 @@ class GantryCache
122
  $this->cache->addDriver('frontend', new WpTransientCacheDriver($this->group, $this->lifetime));
123
  } elseif (is_admin()) {
124
  // TODO get lifetime for backend cache
125
- $this->group = self::ADMIN_GROUP_NAME . '-4.0.3';
126
  $this->cache->addDriver('admin', new WpTransientCacheDriver($this->group, self::ADMIN_LIFETIME));
127
  }
128
  }
26
  /**
27
  *
28
  */
29
+ const ADMIN_GROUP_NAME = 'GantryAdmin-4.0.4';
30
 
31
  const ADMIN_LIFETIME = 86400;
32
 
122
  $this->cache->addDriver('frontend', new WpTransientCacheDriver($this->group, $this->lifetime));
123
  } elseif (is_admin()) {
124
  // TODO get lifetime for backend cache
125
+ $this->group = self::ADMIN_GROUP_NAME . '-4.0.4';
126
  $this->cache->addDriver('admin', new WpTransientCacheDriver($this->group, self::ADMIN_LIFETIME));
127
  }
128
  }
functions.php CHANGED
@@ -168,7 +168,7 @@ function gantry_construct()
168
  /**
169
  * @name GANTRY_VERSION
170
  */
171
- define('GANTRY_VERSION', '4.0.3');
172
 
173
 
174
  if (!defined('DS')) {
168
  /**
169
  * @name GANTRY_VERSION
170
  */
171
+ define('GANTRY_VERSION', '4.0.4');
172
 
173
 
174
  if (!defined('DS')) {
gantry.php CHANGED
@@ -10,7 +10,7 @@
10
  Plugin Name: Gantry Template Framework
11
  Plugin URI: http://www.gantry-framework.org/
12
  Description: This is a Framework to support easily modifiable themes that are very extensible.
13
- Version: 4.0.3
14
  Author: RocketTheme
15
  Author URI: http://www.rockettheme.com/wordpress
16
  License: http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
10
  Plugin Name: Gantry Template Framework
11
  Plugin URI: http://www.gantry-framework.org/
12
  Description: This is a Framework to support easily modifiable themes that are very extensible.
13
+ Version: 4.0.4
14
  Author: RocketTheme
15
  Author URI: http://www.rockettheme.com/wordpress
16
  License: http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
readme.txt CHANGED
@@ -4,7 +4,7 @@ Author URI: http://gantry-framework.org
4
  Tags: gantry, framework, template, theme, widgets, flexible, extensible, configurable, 960px, grid, columns, powerful
5
  Requires at least: 3.2
6
  Tested up to: 3.5.1
7
- Stable tag: 4.0.3
8
 
9
  Gantry is a comprehensive set of building blocks to enable the rapid development and realization of a design into a flexible and powerful web platform
10
 
@@ -84,6 +84,9 @@ Once you downloaded and installed Gantry Framework plugin, please download also
84
 
85
  == Changelog ==
86
 
 
 
 
87
  = 4.0.3 =
88
  * Fixed compatibility with WordPress Multi Site installations
89
  * Fixed a notice where siteurl option didn't had path set
@@ -310,6 +313,9 @@ Once you downloaded and installed Gantry Framework plugin, please download also
310
 
311
  == Upgrade Notice ==
312
 
 
 
 
313
  = 4.0.3 =
314
  Please remember to create a full site backup (files + database) before performing update.
315
 
4
  Tags: gantry, framework, template, theme, widgets, flexible, extensible, configurable, 960px, grid, columns, powerful
5
  Requires at least: 3.2
6
  Tested up to: 3.5.1
7
+ Stable tag: 4.0.4
8
 
9
  Gantry is a comprehensive set of building blocks to enable the rapid development and realization of a design into a flexible and powerful web platform
10
 
84
 
85
  == Changelog ==
86
 
87
+ = 4.0.4 =
88
+ * Fixed a bug introduced in 4.0.3 where CSS files could load with double slashes
89
+
90
  = 4.0.3 =
91
  * Fixed compatibility with WordPress Multi Site installations
92
  * Fixed a notice where siteurl option didn't had path set
313
 
314
  == Upgrade Notice ==
315
 
316
+ = 4.0.4 =
317
+ Please remember to create a full site backup (files + database) before performing update.
318
+
319
  = 4.0.3 =
320
  Please remember to create a full site backup (files + database) before performing update.
321
 
widgets/breadcrumbs.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 4.0.3 March 22, 2013
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
1
  <?php
2
  /**
3
+ * @version 4.0.4 March 22, 2013
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
widgets/loginbutton.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 4.0.3 March 22, 2013
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
1
  <?php
2
  /**
3
+ * @version 4.0.4 March 22, 2013
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
widgets/loginform.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 4.0.3 March 22, 2013
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
1
  <?php
2
  /**
3
+ * @version 4.0.4 March 22, 2013
4
  * @author RocketTheme http://www.rockettheme.com
5
  * @copyright Copyright (C) 2007 - 2013 RocketTheme, LLC
6
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only