Gantry 4 Framework - Version 4.0.5

Version Description

  • Fixed Google WebFonts and breaking fonts caused by s: and g: added to font body class
  • You can now keep your Gantry Framework translation files (.mo) in the WordPress languages directory ie. wp-content/languages/gantry/
  • Gantry is now going to automatically add the templateName-custom.css file if found under css/ directory
  • Added fix for the WP SEO when "Force Rewrite Titles" enabled
  • Title gizmo should now respect the wp_title filter
Download this release

Release Info

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

Code changes from version 4.0.4 to 4.0.5

Files changed (17) hide show
  1. CHANGELOG.php +8 -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. admin_functions.php +2 -2
  6. core/gantry.class.php +8 -7
  7. core/utilities/gantrycache.class.php +2 -2
  8. functions.php +9 -5
  9. gantry.php +1 -1
  10. gizmos/compatibility.php +30 -1
  11. gizmos/font.php +138 -0
  12. gizmos/title.php +5 -1
  13. readme.txt +11 -1
  14. widgets/breadcrumbs.php +2 -2
  15. widgets/loginbutton.php +1 -1
  16. widgets/loginform.php +1 -1
  17. widgets/logo.php +3 -3
CHANGELOG.php CHANGED
@@ -2,7 +2,7 @@
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,6 +27,13 @@ Legend:
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
 
2
  /**
3
  * Gantry For Wordpress
4
  *
5
+ * @version $Id: CHANGELOG.php 59502 2013-04-11 19:40:00Z 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.5 Release [] ------
31
+ # Fixed Google WebFonts and breaking fonts caused by s: and g: added to font body class
32
+ + You can now keep your Gantry Framework translation files (.mo) in the WordPress languages directory ie. wp-content/languages/gantry/
33
+ + Gantry is now going to automatically add the templateName-custom.css file if found under css/ directory
34
+ + Added fix for the WP SEO when "Force Rewrite Titles" enabled
35
+ ^ Title gizmo should now respect the wp_title filter
36
+
37
  ------- 4.0.4 Release [] ------
38
  # Fixed a bug introduced in 4.0.3 where CSS files could load with double slashes
39
 
admin/forms/fields/imagepicker.php CHANGED
@@ -1,6 +1,6 @@
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
1
  <?php
2
  /**
3
+ * @version 4.0.5 April 15, 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.4") $currentVersion = "[DEV]";
31
 
32
  // curl check
33
  if (!function_exists('curl_version')) {
27
 
28
  $currentVersion = GANTRY_VERSION;
29
 
30
+ if ($currentVersion == "\4.0.5") $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.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
1
  /**
2
+ * @version 4.0.5 April 15, 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
admin_functions.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version $Id: admin_functions.php 59376 2013-03-14 19:43:34Z 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
@@ -627,7 +627,7 @@ function gantry_widgets_admin_insert_override_header()
627
  }
628
  $gantry->addStyle($gantry->gantryUrl . '/admin/widgets/gantry-widgets.css');
629
  $gantry->addScript($gantry->gantryUrl . '/admin/widgets/gantry-widgets.js');
630
- $gantry->addInlineScript("var AdminURI = '" . $ajaxurl . "';var GantryLang = {'are_you_sure': '" . _g('This will delete all widgets and settins for this override. Are you sure you want to do this?') . "'};");
631
 
632
  $buffer = "";
633
  $buffer .= "<div id=\"gantry-overrides\">\n";
1
  <?php
2
  /**
3
+ * @version $Id: admin_functions.php 59475 2013-04-08 18:32:06Z jakub $
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
627
  }
628
  $gantry->addStyle($gantry->gantryUrl . '/admin/widgets/gantry-widgets.css');
629
  $gantry->addScript($gantry->gantryUrl . '/admin/widgets/gantry-widgets.js');
630
+ $gantry->addInlineScript("var AdminURI = '" . $ajaxurl . "';var GantryLang = {'are_you_sure': '" . _g('This will delete all widgets and settings for this override. Are you sure you want to do this?') . "'};");
631
 
632
  $buffer = "";
633
  $buffer .= "<div id=\"gantry-overrides\">\n";
core/gantry.class.php CHANGED
@@ -1,6 +1,6 @@
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
@@ -507,6 +507,7 @@ class Gantry
507
  public function finalize()
508
  {
509
  if (!defined('GANTRY_FINALIZED')) {
 
510
  gantry_import('core.params.overrides.gantrycookieparamoverride');
511
  gantry_import('core.params.overrides.gantrysessionparamoverride');
512
 
@@ -1044,7 +1045,7 @@ class Gantry
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,11 +1058,11 @@ class Gantry
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,7 +1630,7 @@ class Gantry
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,7 +1734,7 @@ class Gantry
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,7 +1768,7 @@ class Gantry
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
  }
1
  <?php
2
  /**
3
+ * @version $Id: gantry.class.php 59476 2013-04-08 18:34: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
507
  public function finalize()
508
  {
509
  if (!defined('GANTRY_FINALIZED')) {
510
+ $this->addStyle($this->templateName . '-custom.css', 1000);
511
  gantry_import('core.params.overrides.gantrycookieparamoverride');
512
  gantry_import('core.params.overrides.gantrysessionparamoverride');
513
 
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.5');
1049
  $deps[] = $path;
1050
  }
1051
  }
1058
  if ($this->baseUrl != "/") {
1059
  $path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1060
  }
1061
+ wp_enqueue_script($path, $path, $deps, '4.0.5');
1062
  $deps[] = $path;
1063
  }
1064
  foreach ($this->_full_scripts as $strSrc) {
1065
+ wp_enqueue_script($strSrc, $strSrc, $deps, '4.0.5');
1066
  $deps[] = $strSrc;
1067
  }
1068
 
1630
  if (!defined('GANTRY_FINALIZED')) {
1631
  $this->_styles[$priority][] = $link;
1632
  } else {
1633
+ wp_enqueue_style($link->getUrl(), $link->getUrl(), array(), '4.0.5');
1634
  }
1635
  }
1636
  }
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.5');
1738
  }
1739
  break;
1740
  }
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.5');
1772
  }
1773
  break(2);
1774
  }
core/utilities/gantrycache.class.php CHANGED
@@ -26,7 +26,7 @@ class GantryCache
26
  /**
27
  *
28
  */
29
- const ADMIN_GROUP_NAME = 'GantryAdmin-4.0.4';
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.4';
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.5';
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.5';
126
  $this->cache->addDriver('admin', new WpTransientCacheDriver($this->group, self::ADMIN_LIFETIME));
127
  }
128
  }
functions.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version $Id: functions.php 59365 2013-03-14 09:13:58Z jakub $
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
@@ -168,7 +168,7 @@ function gantry_construct()
168
  /**
169
  * @name GANTRY_VERSION
170
  */
171
- define('GANTRY_VERSION', '4.0.4');
172
 
173
 
174
  if (!defined('DS')) {
@@ -198,9 +198,13 @@ function gantry_construct()
198
  $cache->set('gantry', $gantry);
199
  }
200
 
201
- load_theme_textdomain('gantry');
202
- load_theme_textdomain('gantry', $gantry->templatePath . '/languages');
203
- load_plugin_textdomain('gantry', false, basename($gantry_path) . '/languages/');
 
 
 
 
204
 
205
  // Load the widget positions for the template
206
  $gantry->loadWidgetPositions();
1
  <?php
2
  /**
3
+ * @version $Id: functions.php 59490 2013-04-11 14:45:04Z jakub $
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
168
  /**
169
  * @name GANTRY_VERSION
170
  */
171
+ define('GANTRY_VERSION', '4.0.5');
172
 
173
 
174
  if (!defined('DS')) {
198
  $cache->set('gantry', $gantry);
199
  }
200
 
201
+ $domain = 'gantry';
202
+ $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
203
+
204
+ load_theme_textdomain($domain);
205
+ load_theme_textdomain($domain, $gantry->templatePath . '/languages');
206
+ load_textdomain($domain, WP_LANG_DIR . '/gantry/' . $domain . '-' . $locale . '.mo');
207
+ load_plugin_textdomain($domain, false, basename($gantry_path) . '/languages/');
208
 
209
  // Load the widget positions for the template
210
  $gantry->loadWidgetPositions();
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.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
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.5
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
gizmos/compatibility.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version $Id: compatibility.php 59404 2013-03-19 18:47:39Z jakub $
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
@@ -28,6 +28,15 @@ class GantryGizmoCompatibility extends GantryGizmo
28
  * Copyright (C) 2012 Jakub Baran & Hassan Derakhshandeh
29
  * Contains parts of code from the WooCommerce plugin by WooThemes
30
  */
 
 
 
 
 
 
 
 
 
31
 
32
  function init()
33
  {
@@ -70,6 +79,14 @@ class GantryGizmoCompatibility extends GantryGizmo
70
 
71
  remove_action( 'jigoshop_sidebar', 'jigoshop_get_sidebar', 10 );
72
 
 
 
 
 
 
 
 
 
73
  }
74
 
75
  function query_parsed_init()
@@ -138,4 +155,16 @@ class GantryGizmoCompatibility extends GantryGizmo
138
  }
139
  return $tmpl;
140
  }
 
 
 
 
 
 
 
 
 
 
 
 
141
  }
1
  <?php
2
  /**
3
+ * @version $Id: compatibility.php 59501 2013-04-11 19:36:39Z jakub $
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
28
  * Copyright (C) 2012 Jakub Baran & Hassan Derakhshandeh
29
  * Contains parts of code from the WooCommerce plugin by WooThemes
30
  */
31
+
32
+ function admin_init() {
33
+
34
+ /**
35
+ * WooCommerce Compatibility
36
+ */
37
+
38
+ add_theme_support( 'woocommerce' );
39
+ }
40
 
41
  function init()
42
  {
79
 
80
  remove_action( 'jigoshop_sidebar', 'jigoshop_get_sidebar', 10 );
81
 
82
+ /**
83
+ * WP SEO Compatibility
84
+ */
85
+
86
+ if( function_exists( 'get_wpseo_options' ) ) {
87
+ add_action( 'init', array( &$this, 'wp_seo_fix_force_rewrite_titles' ) );
88
+ }
89
+
90
  }
91
 
92
  function query_parsed_init()
155
  }
156
  return $tmpl;
157
  }
158
+
159
+ /**
160
+ * WP SEO - Fix for the bad rendering of page when "Force Rewrite Titles" is enabled
161
+ */
162
+
163
+ function wp_seo_fix_force_rewrite_titles() {
164
+ global $wpseo_front;
165
+
166
+ remove_action( 'get_header', array( $wpseo_front, 'force_rewrite_output_buffer' ) );
167
+ remove_action( 'wp_footer', array( $wpseo_front, 'flush_cache' ) );
168
+ }
169
+
170
  }
gizmos/font.php ADDED
@@ -0,0 +1,138 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * @version $Id: webfonts.php 59361 2013-03-13 23:10:27Z 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
7
+ */
8
+
9
+ defined('GANTRY_VERSION') or die();
10
+
11
+ gantry_import('core.gantrygizmo');
12
+
13
+ /**
14
+ * @package gantry
15
+ * @subpackage features
16
+ */
17
+ class GantryGizmoFont extends GantryGizmo
18
+ {
19
+
20
+ var $_name = 'font';
21
+ var $_standard_fonts = array(
22
+ "default",
23
+ "geneva",
24
+ "georgia",
25
+ "helvetica",
26
+ "helveticaneue",
27
+ "lucida",
28
+ "optima",
29
+ "palatino",
30
+ "trebuchet",
31
+ "tahoma"
32
+ );
33
+
34
+ private $_value_backup;
35
+
36
+ function isEnabled()
37
+ {
38
+ return true;
39
+ }
40
+
41
+ function query_parsed_init()
42
+ {
43
+ /** @global $gantry Gantry */
44
+ global $gantry;
45
+
46
+ $font_family = $gantry->get('font-family');
47
+
48
+ if (strpos($font_family, ':')) {
49
+ $explode = explode(':', $font_family);
50
+
51
+ $delimiter = $explode[0];
52
+ $name = $explode[1];
53
+ $variant = isset($explode[2]) ? $explode[2] : null;
54
+
55
+ // we re-set the font-family to a font-name with no delimiter
56
+ // for backward compatibility
57
+ $this->_backwardCompatibility($name);
58
+ } else {
59
+ $delimiter = false;
60
+ $name = $font_family;
61
+ $variant = null;
62
+ }
63
+
64
+ if (isset($variant) && $variant) $variant = ':' . $variant;
65
+
66
+ switch ($delimiter) {
67
+ // standard fonts
68
+ case 's':
69
+ break;
70
+ // google fonts
71
+ case 'g':
72
+ $this->_addGoogleFont($name, $variant);
73
+ break;
74
+ default:
75
+ if ($this->_isStandardFont($name)) break;
76
+ if ($this->_searchForGoogleFont($name)) $this->_addGoogleFont($name, $variant);
77
+ }
78
+ }
79
+
80
+ function _isStandardFont($name)
81
+ {
82
+ /** @var $gantry Gantry */
83
+ global $gantry;
84
+ if (strtolower($name) == strtolower($gantry->templateName) || in_array(strtolower($name), $this->_standard_fonts)) {
85
+ return true;
86
+ } else {
87
+ return false;
88
+ }
89
+ }
90
+
91
+ function _addGoogleFont($name, $variant)
92
+ {
93
+ /** @var $gantry Gantry */
94
+ global $gantry;
95
+
96
+ $variant = $variant ? $variant : '';
97
+
98
+ $gantry->addStyle('http://fonts.googleapis.com/css?family=' . str_replace(" ", "+", $name) . $variant);
99
+ $gantry->addInlineStyle("h1, h2 { font-family: '" . $name . "', 'Helvetica', arial, serif; }");
100
+ }
101
+
102
+ function _searchForGoogleFont($name)
103
+ {
104
+ /** @var $gantry Gantry */
105
+ global $gantry;
106
+ $google_json = $gantry->gantryPath . '/' . 'admin' . '/' . 'widgets' . '/' . 'fonts' . '/' . 'js' . '/' . 'google-fonts.json';
107
+ if (!file_exists($google_json)) return false;
108
+
109
+ $fonts = json_decode(file_get_contents($google_json), true);
110
+ $fonts = $fonts['items'];
111
+
112
+ return $this->_in_array_r($name, $fonts);
113
+ }
114
+
115
+ function _backwardCompatibility($value)
116
+ {
117
+ /** @var $gantry Gantry */
118
+ global $gantry;
119
+ $param = $this->_name . '-family';
120
+
121
+ if (in_array($param, $gantry->_bodyclasses)) {
122
+ $position = array_search($param, $gantry->_bodyclasses);
123
+ unset($gantry->_bodyclasses[$position]);
124
+ array_splice($gantry->_bodyclasses, $position, 0, strtolower(str_replace(" ", "-", $param . '-' . $value)));
125
+ }
126
+ }
127
+
128
+ function _in_array_r($needle, $haystack, $strict = true)
129
+ {
130
+ foreach ($haystack as $item) {
131
+ if (($strict ? $item === $needle : $item == $needle) || (is_array($item) && $this->_in_array_r($needle, $item, $strict))) {
132
+ return true;
133
+ }
134
+ }
135
+
136
+ return false;
137
+ }
138
+ }
gizmos/title.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version $Id: title.php 59361 2013-03-13 23:10:27Z 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
@@ -37,11 +37,13 @@ class GantryGizmoTitle extends GantryGizmo
37
  if ($aioseo_options != false && $aioseo_options['aiosp_home_title'] != '' && (is_home() || is_front_page())) {
38
 
39
  $title = $aioseo_options['aiosp_home_title'];
 
40
  $gantry->pageTitle = trim($title);
41
 
42
  } elseif (is_singular() && !empty($aioseo_title) && $aioseo_title != '') {
43
 
44
  $title = $aioseo_title;
 
45
  $gantry->pageTitle = trim($title);
46
 
47
  } elseif ($title != '') {
@@ -218,6 +220,7 @@ class GantryGizmoTitle extends GantryGizmo
218
 
219
  }
220
 
 
221
  $gantry->pageTitle = trim($title);
222
 
223
 
@@ -251,6 +254,7 @@ class GantryGizmoTitle extends GantryGizmo
251
  $title = wp_title('', false) . ' | ' . get_bloginfo('name');
252
  }
253
 
 
254
  $gantry->pageTitle = apply_filters('gantry_title_gizmo', $title);
255
 
256
  }
1
  <?php
2
  /**
3
+ * @version $Id: title.php 59499 2013-04-11 19:23:03Z jakub $
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
37
  if ($aioseo_options != false && $aioseo_options['aiosp_home_title'] != '' && (is_home() || is_front_page())) {
38
 
39
  $title = $aioseo_options['aiosp_home_title'];
40
+ $title = apply_filters('wp_title', $title);
41
  $gantry->pageTitle = trim($title);
42
 
43
  } elseif (is_singular() && !empty($aioseo_title) && $aioseo_title != '') {
44
 
45
  $title = $aioseo_title;
46
+ $title = apply_filters('wp_title', $title);
47
  $gantry->pageTitle = trim($title);
48
 
49
  } elseif ($title != '') {
220
 
221
  }
222
 
223
+ $title = apply_filters('wp_title', $title);
224
  $gantry->pageTitle = trim($title);
225
 
226
 
254
  $title = wp_title('', false) . ' | ' . get_bloginfo('name');
255
  }
256
 
257
+ $title = apply_filters('wp_title', $title);
258
  $gantry->pageTitle = apply_filters('gantry_title_gizmo', $title);
259
 
260
  }
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.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,6 +84,13 @@ Once you downloaded and installed Gantry Framework plugin, please download also
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
 
@@ -313,6 +320,9 @@ Once you downloaded and installed Gantry Framework plugin, please download also
313
 
314
  == Upgrade Notice ==
315
 
 
 
 
316
  = 4.0.4 =
317
  Please remember to create a full site backup (files + database) before performing update.
318
 
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.5
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.5 =
88
+ * Fixed Google WebFonts and breaking fonts caused by s: and g: added to font body class
89
+ * You can now keep your Gantry Framework translation files (.mo) in the WordPress languages directory ie. wp-content/languages/gantry/
90
+ * Gantry is now going to automatically add the templateName-custom.css file if found under css/ directory
91
+ * Added fix for the WP SEO when "Force Rewrite Titles" enabled
92
+ * Title gizmo should now respect the wp_title filter
93
+
94
  = 4.0.4 =
95
  * Fixed a bug introduced in 4.0.3 where CSS files could load with double slashes
96
 
320
 
321
  == Upgrade Notice ==
322
 
323
+ = 4.0.5 =
324
+ Please remember to create a full site backup (files + database) before performing update.
325
+
326
  = 4.0.4 =
327
  Please remember to create a full site backup (files + database) before performing update.
328
 
widgets/breadcrumbs.php CHANGED
@@ -1,6 +1,6 @@
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
@@ -35,7 +35,7 @@ class GantryWidgetBreadcrumbs extends GantryWidget {
35
 
36
  <?php if ($instance['prefix'] != '') echo '<span class="showHere">' . $instance['prefix'] . '</span>'; ?>
37
 
38
- <a href="<?php echo site_url(); ?>" class="pathway"><?php _re('Home'); ?></a>
39
 
40
  <?php if ((is_page() || is_single()) && !is_front_page() && !is_home()) : ?>
41
 
1
  <?php
2
  /**
3
+ * @version 4.0.5 April 15, 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
35
 
36
  <?php if ($instance['prefix'] != '') echo '<span class="showHere">' . $instance['prefix'] . '</span>'; ?>
37
 
38
+ <a href="<?php echo home_url(); ?>" class="pathway"><?php _re('Home'); ?></a>
39
 
40
  <?php if ((is_page() || is_single()) && !is_front_page() && !is_home()) : ?>
41
 
widgets/loginbutton.php CHANGED
@@ -1,6 +1,6 @@
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
1
  <?php
2
  /**
3
+ * @version 4.0.5 April 15, 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.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
1
  <?php
2
  /**
3
+ * @version 4.0.5 April 15, 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/logo.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version $Id: logo.php 59361 2013-03-13 23:10:27Z 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
@@ -37,7 +37,7 @@ global $gantry;
37
  // located in {template}/images/logo/styleX/logo.png
38
  if (isset($instance['autosize']) && $instance['autosize']) {
39
 
40
- $path = $gantry->templatePath . DS . 'images' . DS . 'logo';
41
  $logocss = $instance['css'];
42
 
43
  // get proper path based on perstyle param
@@ -56,7 +56,7 @@ global $gantry;
56
  ob_start();
57
 
58
  ?>
59
- <a href="<?php bloginfo('url'); ?>" id="rt-logo"></a>
60
  <?php
61
  echo ob_get_clean();
62
  }
1
  <?php
2
  /**
3
+ * @version $Id: logo.php 59493 2013-04-11 15:33:32Z jakub $
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
37
  // located in {template}/images/logo/styleX/logo.png
38
  if (isset($instance['autosize']) && $instance['autosize']) {
39
 
40
+ $path = $gantry->templatePath . '/images/' . 'logo';
41
  $logocss = $instance['css'];
42
 
43
  // get proper path based on perstyle param
56
  ob_start();
57
 
58
  ?>
59
+ <a href="<?php echo home_url(); ?>" id="rt-logo"></a>
60
  <?php
61
  echo ob_get_clean();
62
  }