Gantry 4 Framework - Version 4.1.11

Version Description

PHP 7 compatibility fixes

Release Info

Developer	gantry
Plugin	Gantry 4 Framework
Version	4.1.11
Comparing to
See all releases

Code changes from version 4.1.10 to 4.1.11

Files changed (35) hide show

admin/ajax-models/widgets.php +4 -4
admin/forms/fields/imagepicker.php +1 -1
admin/forms/fields/positions.php +3 -3
admin/forms/fields/tips.php +3 -3
admin/forms/fields/updater.php +1 -1
admin/widgets/colorchooser/css/mooRainbow-2.0.css +1 -1
core/config/gantryform.class.php +3 -3
core/config/gantryformitem.class.php +3 -4
core/config/gantryhtmlselect.class.php +28 -28
core/config/gantryselect.class.php +11 -11
core/gantry.class.php +11 -11
core/gantrybrowser.class.php +3 -3
core/gantryini.class.php +11 -11
core/gantryjson.class.php +1 -1
core/gantrylayout.class.php +2 -2
core/gantryplatform.class.php +2 -2
core/rules/facttypes/templatepage.class.php +3 -3
core/rules/phprules/phprules.php +9 -9
core/utilities/gantryarrayhelper.class.php +7 -7
core/utilities/gantrycache.class.php +2 -2
core/utilities/gantrylesscompiler.class.php +3 -3
core/utilities/gantryregistry.class.php +13 -13
core/utilities/gantrysimplexmlelement.class.php +2 -2
core/utilities/gantryxml.class.php +4 -4
core/utilities/registry/format/ini.php +4 -4
core/utilities/registry/format/xml.php +3 -3
functions.php +2 -2
gantry.php +1 -1
gizmos/buddypress.php +1 -1
libs/phpQuery.php +2 -2
readme.txt +7 -1
widgets/breadcrumbs.php +1 -1
widgets/loginbutton.php +1 -1
widgets/loginform.php +1 -1
widgets/menu.php +2 -2

admin/ajax-models/widgets.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: widgets.php ~~61350~~ ~~2015~~-03-10 10:40:~~16Z~~ ~~jakub~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -30,7 +30,7 @@ switch ($action) {
30
31	if (!current_user_can('edit_theme_options')) die('-1');
32
33	- unset($_POST['savewidgets'], $_POST['action'], $$_POST['gantry_action']);
34
35	$override_catalog = gantry_get_override_catalog($gantry->templateName);
36	$next_override = (count($override_catalog) > 0) ? max(array_keys($override_catalog)) + 1 : 1;
	@@ -44,7 +44,7 @@ switch ($action) {
44	check_ajax_referer('save-sidebar-widgets', 'savewidgets');
45	if (!current_user_can('edit_theme_options')) die('-1');
46
47	- unset($_POST['savewidgets'], $_POST['action'], $$_POST['gantry_action']);
48
49	if (!isset($_POST['override_id']) \|\| !isset($_POST['override_name'])) {
50	return 'error';
	@@ -67,7 +67,7 @@ switch ($action) {
67
68	if (!current_user_can('edit_theme_options')) die('-1');
69
70	- unset($_POST['savewidgets'], $_POST['action'], $$_POST['gantry_action']);
71
72	if (!isset($_POST['override_id'])) {
73	return "error - no override id";


1	<?php
2	/**
3	+ * @version $Id: widgets.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

30
31	if (!current_user_can('edit_theme_options')) die('-1');
32
33	+ unset($_POST['savewidgets'], $_POST['action'], ${$_POST['gantry_action']});
34
35	$override_catalog = gantry_get_override_catalog($gantry->templateName);
36	$next_override = (count($override_catalog) > 0) ? max(array_keys($override_catalog)) + 1 : 1;

44	check_ajax_referer('save-sidebar-widgets', 'savewidgets');
45	if (!current_user_can('edit_theme_options')) die('-1');
46
47	+ unset($_POST['savewidgets'], $_POST['action'], ${$_POST['gantry_action']});
48
49	if (!isset($_POST['override_id']) \|\| !isset($_POST['override_name'])) {
50	return 'error';

67
68	if (!current_user_can('edit_theme_options')) die('-1');
69
70	+ unset($_POST['savewidgets'], $_POST['action'], ${$_POST['gantry_action']});
71
72	if (!isset($_POST['override_id'])) {
73	return "error - no override id";

admin/forms/fields/imagepicker.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 4.1.10 ~~January~~ 7, 2016
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only


1	<?php
2	/**
3	+ * @version 4.1.11 November 21, 2016
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

admin/forms/fields/positions.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: positions.php ~~60350~~ ~~2014~~-01-03 23:31:~~45Z~~ ~~jakub~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -83,7 +83,7 @@ class GantryFormFieldPositions extends GantryFormField
83	$this->keyName = '';
84	if ($this->type == 'custom') {
85	$tmpName = str_replace("Position", "Schemas", $this->element['name']);
86	- $tmpSchema = $this~~->$~~tmpName;
87	$this->keyName = key($tmpSchema[1][0]);
88	}
89
	@@ -295,7 +295,7 @@ class GantryFormFieldPositions extends GantryFormField
295	$results = "{";
296	$keysref = "{";
297
298	- foreach ($this~~->$~~name as $key => $set) {
299	$results .= "'$key': [";
300	$keysref .= "'$key': [";
301


1	<?php
2	/**
3	+ * @version $Id: positions.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

83	$this->keyName = '';
84	if ($this->type == 'custom') {
85	$tmpName = str_replace("Position", "Schemas", $this->element['name']);
86	+ $tmpSchema = $this->{$tmpName};
87	$this->keyName = key($tmpSchema[1][0]);
88	}
89

295	$results = "{";
296	$keysref = "{";
297
298	+ foreach ($this->{$name} as $key => $set) {
299	$results .= "'$key': [";
300	$keysref .= "'$key': [";
301

admin/forms/fields/tips.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: tips.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -44,7 +44,7 @@ class GantryFormFieldTips extends GantryFormField
44
45	if ($tabname != "overview") {
46	$output = new stdClass;
47	- $output~~->$~~tabname = new stdClass;
48	for ($i = 0; $i < $count; $i++) {
49	$tip_title = ($xml->tip[$i]['label']);
50	$tip_id = (isset($xml->tip[$i]['id'])) ? $xml->tip[$i]['id'] : false;
	@@ -52,7 +52,7 @@ class GantryFormFieldTips extends GantryFormField
52	if ($tip_id){
53	$tip_id = str_replace('-', '_', $tip_id);
54
55	- $output~~->$~~tabname~~->$~~tip_id = array(
56	'title' => (string)$tip_title,
57	'content' => strip_tags((string)$xml->tip[$i])
58	);


1	<?php
2	/**
3	+ * @version $Id: tips.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

44
45	if ($tabname != "overview") {
46	$output = new stdClass;
47	+ $output->{$tabname} = new stdClass;
48	for ($i = 0; $i < $count; $i++) {
49	$tip_title = ($xml->tip[$i]['label']);
50	$tip_id = (isset($xml->tip[$i]['id'])) ? $xml->tip[$i]['id'] : false;

52	if ($tip_id){
53	$tip_id = str_replace('-', '_', $tip_id);
54
55	+ $output->{$tabname}->{$tip_id} = array(
56	'title' => (string)$tip_title,
57	'content' => strip_tags((string)$xml->tip[$i])
58	);

admin/forms/fields/updater.php CHANGED Viewed

	@@ -27,7 +27,7 @@ class GantryFormFieldUpdater extends GantryFormField
27
28	$currentVersion = GANTRY_VERSION;
29
30	- if ($currentVersion == "\4.1.10") $currentVersion = "[DEV]";
31
32	// curl check
33	if (!function_exists('curl_version')) {


27
28	$currentVersion = GANTRY_VERSION;
29
30	+ if ($currentVersion == "\4.1.11") $currentVersion = "[DEV]";
31
32	// curl check
33	if (!function_exists('curl_version')) {

admin/widgets/colorchooser/css/mooRainbow-2.0.css CHANGED Viewed

	@@ -1,5 +1,5 @@
1	/**
2	- * @version 4.1.10 ~~January~~ 7, 2016
3	* @author RocketTheme http://www.rockettheme.com
4	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
5	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only


1	/**
2	+ * @version 4.1.11 November 21, 2016
3	* @author RocketTheme http://www.rockettheme.com
4	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
5	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

core/config/gantryform.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantryform.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -395,7 +395,7 @@ class GantryForm
395	// Build the fieldset object.
396	$fieldset = (object)array('name' => '', 'label' => '', 'description' => '');
397	foreach ($set->attributes() as $name => $value) {
398	- $fieldset~~->$~~name = (string)$value;
399	}
400
401	// Add the fieldset object to the list.
	@@ -417,7 +417,7 @@ class GantryForm
417	else {
418	$fieldset = (object)array('name' => '', 'label' => '', 'description' => '');
419	foreach ($tmp[0]->attributes() as $name => $value) {
420	- $fieldset~~->$~~name = (string)$value;
421	}
422	}
423


1	<?php
2	/**
3	+ * @version $Id: gantryform.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

395	// Build the fieldset object.
396	$fieldset = (object)array('name' => '', 'label' => '', 'description' => '');
397	foreach ($set->attributes() as $name => $value) {
398	+ $fieldset->{$name} = (string)$value;
399	}
400
401	// Add the fieldset object to the list.

417	else {
418	$fieldset = (object)array('name' => '', 'label' => '', 'description' => '');
419	foreach ($tmp[0]->attributes() as $name => $value) {
420	+ $fieldset->{$name} = (string)$value;
421	}
422	}
423

core/config/gantryformitem.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantryformitem.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -193,7 +193,7 @@ abstract class GantryFormItem
193	public function __set($name, $value)
194	{
195	if (property_exists($this, $name)) {
196	- $this~~->$~~name = $value;
197	}
198	}
199
	@@ -382,11 +382,10 @@ abstract class GantryFormItem
382	return $this->label;
383	break;
384	default :
385	- if (property_exists($this, $name)) return $this~~->$~~name; else
386	return null;
387	break;
388	}
389	- return null;
390	}
391
392


1	<?php
2	/**
3	+ * @version $Id: gantryformitem.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

193	public function __set($name, $value)
194	{
195	if (property_exists($this, $name)) {
196	+ $this->{$name} = $value;
197	}
198	}
199

382	return $this->label;
383	break;
384	default :
385	+ if (property_exists($this, $name)) return $this->{$name}; else
386	return null;
387	break;
388	}

389	}
390
391

core/config/gantryhtmlselect.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantryhtmlselect.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -202,13 +202,13 @@ abstract class GantryHtmlSelect
202	}
203	} elseif (is_object($group)) {
204	// Sub-list is in a property of an object
205	- $subList = $group~~->$~~options['group.items'];
206	$noGroup = false;
207	- if (isset($group~~->$~~options['group.label'])) {
208	- $label = $group~~->$~~options['group.label'];
209	}
210	- if (isset($options['group.id']) && isset($group~~->$~~options['group.id'])) {
211	- $id = $group~~->$~~options['group.id'];
212	}
213	} else {
214	//TODO handle error
	@@ -288,8 +288,8 @@ abstract class GantryHtmlSelect
288	public static function optgroup($text, $optKey = 'value', $optText = 'text')
289	{
290	$obj = new stdClass;
291	- $obj~~->$~~optKey = '<OPTGROUP>';
292	- $obj~~->$~~optText = $text;
293	return $obj;
294	}
295
	@@ -343,8 +343,8 @@ abstract class GantryHtmlSelect
343	$options['disable'] = $disable;
344	}
345	$obj = new stdClass();
346	- $obj~~->$~~options['option.key'] = $value;
347	- $obj~~->$~~options['option.text'] = trim($text) ? $text : $value;
348
349	/*
350	* If a label is provided, save it. If no label is provided and there is
	@@ -353,19 +353,19 @@ abstract class GantryHtmlSelect
353	$hasProperty = $options['option.label'] !== null;
354	if (isset($options['label'])) {
355	$labelProperty = $hasProperty ? $options['option.label'] : 'label';
356	- $obj~~->$~~labelProperty = $options['label'];
357	} elseif ($hasProperty) {
358	- $obj~~->$~~options['option.label'] = '';
359	}
360
361	// Set attributes only if there is a property and a value
362	if ($options['attr'] !== null) {
363	- $obj~~->$~~options['option.attr'] = $options['attr'];
364	}
365
366	// Set disable only if it has a property and a value
367	if ($options['disable'] !== null) {
368	- $obj~~->$~~options['option.disable'] = $options['disable'];
369	}
370	return $obj;
371	}
	@@ -455,18 +455,18 @@ abstract class GantryHtmlSelect
455	$extra .= ' disabled="disabled"';
456	}
457	} elseif (is_object($element)) {
458	- $key = $options['option.key'] === null ? $elementKey : $element~~->$~~options['option.key'];
459	- $text = $element~~->$~~options['option.text'];
460	- if (isset($element~~->$~~options['option.attr'])) {
461	- $attr = $element~~->$~~options['option.attr'];
462	}
463	- if (isset($element~~->$~~options['option.id'])) {
464	- $id = $element~~->$~~options['option.id'];
465	}
466	- if (isset($element~~->$~~options['option.label'])) {
467	- $label = $element~~->$~~options['option.label'];
468	}
469	- if (isset($element~~->$~~options['option.disable']) && $element~~->$~~options['option.disable']) {
470	$extra .= ' disabled="disabled"';
471	}
472	} else {
	@@ -511,7 +511,7 @@ abstract class GantryHtmlSelect
511	$extra = ($id ? ' id="' . $id . '"' : '') . ($label ? ' label="' . $label . '"' : '') . ($attr ? ' ' . $attr : '') . $extra;
512	if (is_array($options['list.select'])) {
513	foreach ($options['list.select'] as $val) {
514	- $key2 = is_object($val) ? $val~~->$~~options['option.key'] : $val;
515	if ($key == $key2) {
516	$extra .= ' selected="selected"';
517	break;
	@@ -557,15 +557,15 @@ abstract class GantryHtmlSelect
557	$id_text = $idtag ? $idtag : $name;
558
559	foreach ($data as $ind => $obj) {
560	- $k = $obj~~->$~~optKey;
561	- $t = $translate ? _r($obj~~->$~~optText) : $obj~~->$~~optText;
562	$id = (isset($obj->id) ? $obj->id : null);
563
564	$extra = '';
565	$extra .= $id ? ' id="' . $obj->id . '"' : '';
566	if (is_array($selected)) {
567	foreach ($selected as $val) {
568	- $k2 = is_object($val) ? $val~~->$~~optKey : $val;
569	if ($k == $k2) {
570	$extra .= ' selected="selected"';
571	break;
	@@ -574,7 +574,7 @@ abstract class GantryHtmlSelect
574	} else {
575	$extra .= ((string)$k == (string)$selected ? ' checked="checked"' : '');
576	}
577	- $html .= "\n\t" . '<input type="radio" name="' . $name . '"' . ' id="' . $id_text . $k . '" value="' . $k . '"' . ' ' . $extra . ' ' . $attribs . '/>' . "\n\t" . '<label for="' . $id_text . $k . '" id="' . $id_text . $k . '-lbl" class="radiobtn_' . strtolower($obj~~->$~~optText) . '">' . $t . '</label>';
578	}
579	$html .= "\n";
580	return $html;


1	<?php
2	/**
3	+ * @version $Id: gantryhtmlselect.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

202	}
203	} elseif (is_object($group)) {
204	// Sub-list is in a property of an object
205	+ $subList = $group->{$options['group.items']};
206	$noGroup = false;
207	+ if (isset($group->{$options['group.label']})) {
208	+ $label = $group->{$options['group.label']};
209	}
210	+ if (isset($options['group.id']) && isset($group->{$options['group.id']})) {
211	+ $id = $group->{$options['group.id']};
212	}
213	} else {
214	//TODO handle error

288	public static function optgroup($text, $optKey = 'value', $optText = 'text')
289	{
290	$obj = new stdClass;
291	+ $obj->{$optKey} = '<OPTGROUP>';
292	+ $obj->{$optText} = $text;
293	return $obj;
294	}
295

343	$options['disable'] = $disable;
344	}
345	$obj = new stdClass();
346	+ $obj->{$options['option.key']} = $value;
347	+ $obj->{$options['option.text']} = trim($text) ? $text : $value;
348
349	/*
350	* If a label is provided, save it. If no label is provided and there is

353	$hasProperty = $options['option.label'] !== null;
354	if (isset($options['label'])) {
355	$labelProperty = $hasProperty ? $options['option.label'] : 'label';
356	+ $obj->{$labelProperty} = $options['label'];
357	} elseif ($hasProperty) {
358	+ $obj->{$options['option.label']} = '';
359	}
360
361	// Set attributes only if there is a property and a value
362	if ($options['attr'] !== null) {
363	+ $obj->{$options['option.attr']} = $options['attr'];
364	}
365
366	// Set disable only if it has a property and a value
367	if ($options['disable'] !== null) {
368	+ $obj->{$options['option.disable']} = $options['disable'];
369	}
370	return $obj;
371	}

455	$extra .= ' disabled="disabled"';
456	}
457	} elseif (is_object($element)) {
458	+ $key = $options['option.key'] === null ? $elementKey : $element->{$options['option.key']};
459	+ $text = $element->{$options['option.text']};
460	+ if (isset($element->{$options['option.attr']})) {
461	+ $attr = $element->{$options['option.attr']};
462	}
463	+ if (isset($element->{$options['option.id']})) {
464	+ $id = $element->{$options['option.id']};
465	}
466	+ if (isset($element->{$options['option.label']})) {
467	+ $label = $element->{$options['option.label']};
468	}
469	+ if (isset($element->{$options['option.disable']}) && $element->{$options['option.disable']}) {
470	$extra .= ' disabled="disabled"';
471	}
472	} else {

511	$extra = ($id ? ' id="' . $id . '"' : '') . ($label ? ' label="' . $label . '"' : '') . ($attr ? ' ' . $attr : '') . $extra;
512	if (is_array($options['list.select'])) {
513	foreach ($options['list.select'] as $val) {
514	+ $key2 = is_object($val) ? $val->{$options['option.key']} : $val;
515	if ($key == $key2) {
516	$extra .= ' selected="selected"';
517	break;

557	$id_text = $idtag ? $idtag : $name;
558
559	foreach ($data as $ind => $obj) {
560	+ $k = $obj->{$optKey};
561	+ $t = $translate ? _r($obj->{$optText}) : $obj->{$optText};
562	$id = (isset($obj->id) ? $obj->id : null);
563
564	$extra = '';
565	$extra .= $id ? ' id="' . $obj->id . '"' : '';
566	if (is_array($selected)) {
567	foreach ($selected as $val) {
568	+ $k2 = is_object($val) ? $val->{$optKey} : $val;
569	if ($k == $k2) {
570	$extra .= ' selected="selected"';
571	break;

574	} else {
575	$extra .= ((string)$k == (string)$selected ? ' checked="checked"' : '');
576	}
577	+ $html .= "\n\t" . '<input type="radio" name="' . $name . '"' . ' id="' . $id_text . $k . '" value="' . $k . '"' . ' ' . $extra . ' ' . $attribs . '/>' . "\n\t" . '<label for="' . $id_text . $k . '" id="' . $id_text . $k . '-lbl" class="radiobtn_' . strtolower($obj->{$optText}) . '">' . $t . '</label>';
578	}
579	$html .= "\n";
580	return $html;

core/config/gantryselect.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantryselect.class.php ~~58623~~ ~~2012~~-12-15 22:~~01:32Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -24,8 +24,8 @@ class GantrySelect
24	function option($value, $text = '', $value_name = 'value', $text_name = 'text', $disable = false)
25	{
26	$obj = new stdClass;
27	- $obj~~->$~~value_name = $value;
28	- $obj~~->$~~text_name = trim($text) ? $text : $value;
29	$obj->disable = $disable;
30	return $obj;
31	}
	@@ -40,8 +40,8 @@ class GantrySelect
40	function optgroup($text, $value_name = 'value', $text_name = 'text')
41	{
42	$obj = new stdClass;
43	- $obj~~->$~~value_name = '<OPTGROUP>';
44	- $obj~~->$~~text_name = $text;
45	return $obj;
46	}
47
	@@ -72,8 +72,8 @@ class GantrySelect
72	$extra .= ' disabled="disabled"';
73	}
74	} else {
75	- $k = $element~~->$~~key;
76	- $t = $element~~->$~~text;
77	$id = (isset($element->id) ? $element->id : null);
78	if (isset($element->disable) && $element->disable) {
79	$extra .= ' disabled="disabled"';
	@@ -98,7 +98,7 @@ class GantrySelect
98	//$extra .= $id ? ' id="' . $arr[$i]->id . '"' : '';
99	if (is_array($selected)) {
100	foreach ($selected as $val) {
101	- $k2 = is_object($val) ? $val~~->$~~key : $val;
102	if ($k == $k2) {
103	$extra .= ' selected="selected"';
104	break;
	@@ -217,15 +217,15 @@ class GantrySelect
217	}
218
219	for ($i = 0, $n = count($arr); $i < $n; $i++) {
220	- $k = $arr[$i]~~->$~~key;
221	- $t = $translate ? _r($arr[$i]~~->$~~text) : $arr[$i]~~->$~~text;
222	$id = (isset($arr[$i]->id) ? @$arr[$i]->id : null);
223
224	$extra = '';
225	$extra .= $id ? " id=\"" . $arr[$i]->id . "\"" : '';
226	if (is_array($selected)) {
227	foreach ($selected as $val) {
228	- $k2 = is_object($val) ? $val~~->$~~key : $val;
229	if ($k == $k2) {
230	$extra .= " selected=\"selected\"";
231	break;


1	<?php
2	/**
3	+ * @version $Id: gantryselect.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

24	function option($value, $text = '', $value_name = 'value', $text_name = 'text', $disable = false)
25	{
26	$obj = new stdClass;
27	+ $obj->{$value_name} = $value;
28	+ $obj->{$text_name} = trim($text) ? $text : $value;
29	$obj->disable = $disable;
30	return $obj;
31	}

40	function optgroup($text, $value_name = 'value', $text_name = 'text')
41	{
42	$obj = new stdClass;
43	+ $obj->{$value_name} = '<OPTGROUP>';
44	+ $obj->{$text_name} = $text;
45	return $obj;
46	}
47

72	$extra .= ' disabled="disabled"';
73	}
74	} else {
75	+ $k = $element->{$key};
76	+ $t = $element->{$text};
77	$id = (isset($element->id) ? $element->id : null);
78	if (isset($element->disable) && $element->disable) {
79	$extra .= ' disabled="disabled"';

98	//$extra .= $id ? ' id="' . $arr[$i]->id . '"' : '';
99	if (is_array($selected)) {
100	foreach ($selected as $val) {
101	+ $k2 = is_object($val) ? $val->{$key} : $val;
102	if ($k == $k2) {
103	$extra .= ' selected="selected"';
104	break;

217	}
218
219	for ($i = 0, $n = count($arr); $i < $n; $i++) {
220	+ $k = $arr[$i]->{$key};
221	+ $t = $translate ? _r($arr[$i]->{$text}) : $arr[$i]->{$text};
222	$id = (isset($arr[$i]->id) ? @$arr[$i]->id : null);
223
224	$extra = '';
225	$extra .= $id ? " id=\"" . $arr[$i]->id . "\"" : '';
226	if (is_array($selected)) {
227	foreach ($selected as $val) {
228	+ $k2 = is_object($val) ? $val->{$key} : $val;
229	if ($k == $k2) {
230	$extra .= " selected=\"selected\"";
231	break;

core/gantry.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantry.class.php ~~61405~~ ~~2015~~-07-20 08:11:~~28Z~~ ~~jakub~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -1056,7 +1056,7 @@ class Gantry
1056	$path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1057	}
1058	$filename = strtolower(basename($path, '.css')) . rand(0, 1000);
1059	- wp_enqueue_style($filename, $path, array(), '4.1.10');
1060	$deps[] = $path;
1061	}
1062	}
	@@ -1069,11 +1069,11 @@ class Gantry
1069	if ($this->baseUrl != "/") {
1070	$path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1071	}
1072	- wp_enqueue_script($path, $path, $deps, '4.1.10');
1073	$deps[] = $path;
1074	}
1075	foreach ($this->_header_full_scripts as $strSrc) {
1076	- wp_enqueue_script($strSrc, $strSrc, $deps, '4.1.10');
1077	$deps[] = $strSrc;
1078	}
1079
	@@ -1113,11 +1113,11 @@ class Gantry
1113	if ($this->baseUrl != "/") {
1114	$path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1115	}
1116	- wp_enqueue_script($path, $path, $deps, '4.1.10', true);
1117	$deps[] = $path;
1118	}
1119	foreach ($this->_footer_full_scripts as $strSrc) {
1120	- wp_enqueue_script($strSrc, $strSrc, $deps, '4.1.10', true);
1121	$deps[] = $strSrc;
1122	}
1123
	@@ -1765,7 +1765,7 @@ class Gantry
1765	if (!defined('GANTRY_FINALIZED')) {
1766	$this->_styles[$priority][] = $link;
1767	} else {
1768	- wp_enqueue_style($link->getUrl(), $link->getUrl(), array(), '4.1.10');
1769	}
1770	}
1771	}
	@@ -1879,7 +1879,7 @@ class Gantry
1879	$this->_footerscripts[$full_path] = $check_url_path . $query_string;
1880	}
1881	} else {
1882	- wp_enqueue_script($check_url_path, $check_url_path, array(), '4.1.10', $in_footer);
1883	}
1884	break;
1885	}
	@@ -1917,7 +1917,7 @@ class Gantry
1917	$this->_footerscripts[$check_path] = $check_url_path . $query_string;
1918	}
1919	} else {
1920	- wp_enqueue_script($check_url_path, $check_url_path, array(), '4.1.10', $in_footer);
1921	}
1922	break(2);
1923	}
	@@ -2127,12 +2127,12 @@ class Gantry
2127	foreach ($this->_config_vars as $config_var_name => $class_var_name) {
2128	$default_config_var_name = 'gantry_default_' . $config_var_name;
2129	if (isset($$default_config_var_name)) {
2130	- $this~~->$~~class_var_name = $$default_config_var_name;
2131	$this->__cacheables[] = $class_var_name;
2132	}
2133	$template_config_var_name = 'gantry_' . $config_var_name;
2134	if (isset($$template_config_var_name)) {
2135	- $this~~->$~~class_var_name = $$template_config_var_name;
2136	$this->__cacheables[] = $class_var_name;
2137	}
2138	}


1	<?php
2	/**
3	+ * @version $Id: gantry.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

1056	$path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1057	}
1058	$filename = strtolower(basename($path, '.css')) . rand(0, 1000);
1059	+ wp_enqueue_style($filename, $path, array(), '4.1.11');
1060	$deps[] = $path;
1061	}
1062	}

1069	if ($this->baseUrl != "/") {
1070	$path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1071	}
1072	+ wp_enqueue_script($path, $path, $deps, '4.1.11');
1073	$deps[] = $path;
1074	}
1075	foreach ($this->_header_full_scripts as $strSrc) {
1076	+ wp_enqueue_script($strSrc, $strSrc, $deps, '4.1.11');
1077	$deps[] = $strSrc;
1078	}
1079

1113	if ($this->baseUrl != "/") {
1114	$path = '/' . preg_replace('#^' . quotemeta($this->baseUrl) . '#', "", $path);
1115	}
1116	+ wp_enqueue_script($path, $path, $deps, '4.1.11', true);
1117	$deps[] = $path;
1118	}
1119	foreach ($this->_footer_full_scripts as $strSrc) {
1120	+ wp_enqueue_script($strSrc, $strSrc, $deps, '4.1.11', true);
1121	$deps[] = $strSrc;
1122	}
1123

1765	if (!defined('GANTRY_FINALIZED')) {
1766	$this->_styles[$priority][] = $link;
1767	} else {
1768	+ wp_enqueue_style($link->getUrl(), $link->getUrl(), array(), '4.1.11');
1769	}
1770	}
1771	}

1879	$this->_footerscripts[$full_path] = $check_url_path . $query_string;
1880	}
1881	} else {
1882	+ wp_enqueue_script($check_url_path, $check_url_path, array(), '4.1.11', $in_footer);
1883	}
1884	break;
1885	}

1917	$this->_footerscripts[$check_path] = $check_url_path . $query_string;
1918	}
1919	} else {
1920	+ wp_enqueue_script($check_url_path, $check_url_path, array(), '4.1.11', $in_footer);
1921	}
1922	break(2);
1923	}

2127	foreach ($this->_config_vars as $config_var_name => $class_var_name) {
2128	$default_config_var_name = 'gantry_default_' . $config_var_name;
2129	if (isset($$default_config_var_name)) {
2130	+ $this->{$class_var_name} = $$default_config_var_name;
2131	$this->__cacheables[] = $class_var_name;
2132	}
2133	$template_config_var_name = 'gantry_' . $config_var_name;
2134	if (isset($$template_config_var_name)) {
2135	+ $this->{$class_var_name} = $$template_config_var_name;
2136	$this->__cacheables[] = $class_var_name;
2137	}
2138	}

core/gantrybrowser.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantrybrowser.class.php ~~60217~~ ~~2013~~-11-14 18:24:~~22Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -70,8 +70,8 @@ class GantryBrowser
70	return $this->name;
71	break;
72	default:
73	- if (property_exists($this, $name) && isset($this~~->$~~name)) {
74	- return $this~~->$~~name;
75	} elseif (method_exists($this, 'get' . ucfirst($name))) {
76	return call_user_func(array($this, 'get' . ucfirst($name)));
77	} else {


1	<?php
2	/**
3	+ * @version $Id: gantrybrowser.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

70	return $this->name;
71	break;
72	default:
73	+ if (property_exists($this, $name) && isset($this->{$name})) {
74	+ return $this->{$name};
75	} elseif (method_exists($this, 'get' . ucfirst($name))) {
76	return call_user_func(array($this, 'get' . ucfirst($name)));
77	} else {

core/gantryini.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantryini.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -182,7 +182,7 @@ class GantryINI
182	if ($line && $line{0} == '[' && $line{$lineLen - 1} == ']') {
183	$sec_name = substr($line, 1, $lineLen - 2);
184	if ($process_sections) {
185	- $obj~~->$~~sec_name = new stdClass();
186	}
187	} else {
188	if ($pos = strpos($line, '=')) {
	@@ -232,12 +232,12 @@ class GantryINI
232
233	if ($process_sections) {
234	if ($sec_name != '') {
235	- $obj~~->$~~sec_name~~->$~~property = $values[$newlinekey];
236	} else {
237	- $obj~~->$~~property = $values[$newlinekey];
238	}
239	} else {
240	- $obj~~->$~~property = $values[$newlinekey];
241	}
242	} else {
243	//unescape the \\|
	@@ -257,12 +257,12 @@ class GantryINI
257	if ($process_sections) {
258	$value = str_replace('\n', "\n", $value);
259	if ($sec_name != '') {
260	- $obj~~->$~~sec_name~~->$~~property = $value;
261	} else {
262	- $obj~~->$~~property = $value;
263	}
264	} else {
265	- $obj~~->$~~property = str_replace('\n', "\n", $value);
266	}
267	}
268	} else {
	@@ -273,12 +273,12 @@ class GantryINI
273	$property = '__invalid' . $unparsed++ . '__';
274	if ($process_sections) {
275	if ($sec_name != '') {
276	- $obj~~->$~~sec_name~~->$~~property = trim($line);
277	} else {
278	- $obj~~->$~~property = trim($line);
279	}
280	} else {
281	- $obj~~->$~~property = trim($line);
282	}
283	}
284	}


1	<?php
2	/**
3	+ * @version $Id: gantryini.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

182	if ($line && $line{0} == '[' && $line{$lineLen - 1} == ']') {
183	$sec_name = substr($line, 1, $lineLen - 2);
184	if ($process_sections) {
185	+ $obj->{$sec_name} = new stdClass();
186	}
187	} else {
188	if ($pos = strpos($line, '=')) {

232
233	if ($process_sections) {
234	if ($sec_name != '') {
235	+ $obj->{$sec_name}->{$property} = $values[$newlinekey];
236	} else {
237	+ $obj->{$property} = $values[$newlinekey];
238	}
239	} else {
240	+ $obj->{$property} = $values[$newlinekey];
241	}
242	} else {
243	//unescape the \\|

257	if ($process_sections) {
258	$value = str_replace('\n', "\n", $value);
259	if ($sec_name != '') {
260	+ $obj->{$sec_name}->{$property} = $value;
261	} else {
262	+ $obj->{$property} = $value;
263	}
264	} else {
265	+ $obj->{$property} = str_replace('\n', "\n", $value);
266	}
267	}
268	} else {

273	$property = '__invalid' . $unparsed++ . '__';
274	if ($process_sections) {
275	if ($sec_name != '') {
276	+ $obj->{$sec_name}->{$property} = trim($line);
277	} else {
278	+ $obj->{$property} = trim($line);
279	}
280	} else {
281	+ $obj->{$property} = trim($line);
282	}
283	}
284	}

core/gantryjson.class.php CHANGED Viewed

	@@ -226,7 +226,7 @@ class GantryJSON
226	if (is_object($result)) {
227	foreach ($params as $key => $value)
228	{
229	- $result~~->$~~key = $value;
230	}
231	} else {
232	$result = get_object_vars($params);


226	if (is_object($result)) {
227	foreach ($params as $key => $value)
228	{
229	+ $result->{$key} = $value;
230	}
231	} else {
232	$result = get_object_vars($params);

core/gantrylayout.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantrylayout.class.php ~~59702~~ ~~2013~~-05-17 21:54:~~07Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -27,7 +27,7 @@ class GantryLayout
27	$ret = new stdClass();
28	$ret_array = array_merge($this->render_params, $params);
29	foreach ($ret_array as $param_name => $param_value) {
30	- $ret~~->$~~param_name = $param_value;
31	}
32	return $ret;
33	}


1	<?php
2	/**
3	+ * @version $Id: gantrylayout.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

27	$ret = new stdClass();
28	$ret_array = array_merge($this->render_params, $params);
29	foreach ($ret_array as $param_name => $param_value) {
30	+ $ret->{$param_name} = $param_value;
31	}
32	return $ret;
33	}

core/gantryplatform.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantryplatform.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -123,7 +123,7 @@ class GantryPlatform
123	protected function unsuportedInfo()
124	{
125	foreach (get_object_vars($this) as $var_name => $var_value) {
126	- if (null == $var_value) $this~~->$~~var_name = "unsupported";
127	}
128	}
129


1	<?php
2	/**
3	+ * @version $Id: gantryplatform.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

123	protected function unsuportedInfo()
124	{
125	foreach (get_object_vars($this) as $var_name => $var_value) {
126	+ if (null == $var_value) $this->{$var_name} = "unsupported";
127	}
128	}
129

core/rules/facttypes/templatepage.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: templatepage.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -28,8 +28,8 @@ class GantryFactTemplatePage extends GantryOverrideFact
28	}
29	break;
30	default:
31	- if (isset($query~~->$~~check)) {
32	- $ret = $query~~->$~~check;
33	}
34	}
35	return $ret;


1	<?php
2	/**
3	+ * @version $Id: templatepage.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

28	}
29	break;
30	default:
31	+ if (isset($query->{$check})) {
32	+ $ret = $query->{$check};
33	}
34	}
35	return $ret;

core/rules/phprules/phprules.php CHANGED Viewed

@@ -1,11 +1,11 @@
             <?php
-            -
            	define('PHPRULES_VERSION', '0.5.3');
-            -
                require_once('phprules/ActionFassade.class.php');
-            -
            	require_once('phprules/Fact.class.php');
-            -
            	require_once('phprules/Rule.class.php');
-            -
            	require_once('phprules/RuleBase.class.php');
-            -
            	require_once('phprules/RuleReader.class.php');
-            -
            	require_once('phprules/RuleSession.class.php');
-            -
            	require_once('phprules/WorkingMemory.class.php');
-            -
             ?>


1	<?php
2	+ define('PHPRULES_VERSION', '0.5.3');
3
4	+ require_once('phprules/ActionFassade.class.php');
5	+ require_once('phprules/Fact.class.php');
6	+ require_once('phprules/Rule.class.php');
7	+ require_once('phprules/RuleBase.class.php');
8	+ require_once('phprules/RuleReader.class.php');
9	+ require_once('phprules/RuleSession.class.php');
10	+ require_once('phprules/WorkingMemory.class.php');
11	+ ?>

core/utilities/gantryarrayhelper.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantryarrayhelper.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -66,9 +66,9 @@ class GantryArrayHelper
66	$obj = new $class();
67	foreach ($array as $k => $v) {
68	if (is_array($v)) {
69	- $obj~~->$~~k = GantryArrayHelper::toObject($v, $class);
70	} else {
71	- $obj~~->$~~k = $v;
72	}
73	}
74	}
	@@ -152,8 +152,8 @@ class GantryArrayHelper
152	$item = & $array[$i];
153	if (is_array($item) && isset ($item[$index])) {
154	$result[] = $item[$index];
155	- } elseif (is_object($item) && isset ($item~~->$~~index)) {
156	- $result[] = $item~~->$~~index;
157	}
158	// else ignore the entry
159	}
	@@ -295,10 +295,10 @@ class GantryArrayHelper
295	if (array_key_exists($i, $params['direction'])) {
296	$direction = $params['direction'][$i];
297	}
298	- if ($a~~->$~~params['key'][$i] > $b~~->$~~params['key'][$i]) {
299	return $direction;
300	}
301	- if ($a~~->$~~params['key'][$i] < $b~~->$~~params['key'][$i]) {
302	return -1 * $direction;
303	}
304	}


1	<?php
2	/**
3	+ * @version $Id: gantryarrayhelper.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

66	$obj = new $class();
67	foreach ($array as $k => $v) {
68	if (is_array($v)) {
69	+ $obj->{$k} = GantryArrayHelper::toObject($v, $class);
70	} else {
71	+ $obj->{$k} = $v;
72	}
73	}
74	}

152	$item = & $array[$i];
153	if (is_array($item) && isset ($item[$index])) {
154	$result[] = $item[$index];
155	+ } elseif (is_object($item) && isset ($item->{$index})) {
156	+ $result[] = $item->{$index};
157	}
158	// else ignore the entry
159	}

295	if (array_key_exists($i, $params['direction'])) {
296	$direction = $params['direction'][$i];
297	}
298	+ if ($a->{$params['key'][$i]} > $b->{$params['key'][$i]}) {
299	return $direction;
300	}
301	+ if ($a->{$params['key'][$i]} < $b->{$params['key'][$i]}) {
302	return -1 * $direction;
303	}
304	}

core/utilities/gantrycache.class.php CHANGED Viewed

	@@ -26,7 +26,7 @@ class GantryCache
26	/**
27	*
28	*/
29	- const ADMIN_GROUP_NAME = 'GantryAdmin-4.1.10';
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.1.10';
126	$this->cache->addDriver('admin', new WpTransientCacheDriver($this->group, self::ADMIN_LIFETIME));
127	}
128	}


26	/**
27	*
28	*/
29	+ const ADMIN_GROUP_NAME = 'GantryAdmin-4.1.11';
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.1.11';
126	$this->cache->addDriver('admin', new WpTransientCacheDriver($this->group, self::ADMIN_LIFETIME));
127	}
128	}

core/utilities/gantrylesscompiler.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantrylesscompiler.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -1429,7 +1429,7 @@ class GantryLessCompiler {
1429	// type based operators
1430	$fname = "op_${ltype}_${rtype}";
1431	if (is_callable(array($this, $fname))) {
1432	- $out = $this~~->$~~fname($op, $left, $right);
1433	if (!is_null($out)) return $out;
1434	}
1435
	@@ -3181,7 +3181,7 @@ class GantryLessCompiler_Parser {
3181	protected function genericList(&$out, $parseItem, $delim="", $flatten=true) {
3182	$s = $this->seek();
3183	$items = array();
3184	- while ($this~~->$~~parseItem($value)) {
3185	$items[] = $value;
3186	if ($delim) {
3187	if (!$this->literal($delim)) break;


1	<?php
2	/**
3	+ * @version $Id: gantrylesscompiler.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

1429	// type based operators
1430	$fname = "op_${ltype}_${rtype}";
1431	if (is_callable(array($this, $fname))) {
1432	+ $out = $this->{$fname}($op, $left, $right);
1433	if (!is_null($out)) return $out;
1434	}
1435

3181	protected function genericList(&$out, $parseItem, $delim="", $flatten=true) {
3182	$s = $this->seek();
3183	$items = array();
3184	+ while ($this->{$parseItem}($value)) {
3185	$items[] = $value;
3186	if ($delim) {
3187	if (!$this->literal($delim)) break;

core/utilities/gantryregistry.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantryregistry.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -95,8 +95,8 @@ class GantryRegistry
95
96	// Traverse the registry to find the correct node for the result.
97	for ($i = 0, $n = count($nodes); $i < $n; $i++) {
98	- if (isset($node~~->$~~nodes[$i])) {
99	- $node = $node~~->$~~nodes[$i];
100	} else {
101	break;
102	}
	@@ -125,7 +125,7 @@ class GantryRegistry
125	$result = $default;
126
127	if (!strpos($path, '.')) {
128	- return (isset($this->data~~->$~~path) && !is_null($this->data~~->$~~path)) ? $this->data~~->$~~path : $default;
129	}
130	// Explode the registry path into an array
131	$nodes = explode('.', $path);
	@@ -135,8 +135,8 @@ class GantryRegistry
135	$found = false;
136	// Traverse the registry to find the correct node for the result.
137	foreach ($nodes as $n) {
138	- if (is_object($node) && isset($node~~->$~~n)) {
139	- $node = $node~~->$~~n;
140	$found = true;
141	} elseif (is_array($node) && array_key_exists($n, $node)) {
142	$node = $node[$n];
	@@ -312,14 +312,14 @@ class GantryRegistry
312
313	// Traverse the registry to find the correct node for the result.
314	for ($i = 0, $n = count($nodes) - 1; $i < $n; $i++) {
315	- if (!isset($node~~->$~~nodes[$i]) && ($i != $n)) {
316	- $node~~->$~~nodes[$i] = new stdClass();
317	}
318	- $node = $node~~->$~~nodes[$i];
319	}
320
321	// Get the old value if exists so we can return it
322	- $result = $node~~->$~~nodes[$i] = $value;
323	}
324
325	return $result;
	@@ -388,10 +388,10 @@ class GantryRegistry
388
389	foreach ($data as $k => $v) {
390	if ((is_array($v) && GantryArrayHelper::isAssociative($v)) \|\| is_object($v)) {
391	- $parent~~->$~~k = new stdClass();
392	- $this->bindData($parent~~->$~~k, $v);
393	} else {
394	- $parent~~->$~~k = $v;
395	}
396	}
397	}


1	<?php
2	/**
3	+ * @version $Id: gantryregistry.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

95
96	// Traverse the registry to find the correct node for the result.
97	for ($i = 0, $n = count($nodes); $i < $n; $i++) {
98	+ if (isset($node->{$nodes[$i]})) {
99	+ $node = $node->{$nodes[$i]};
100	} else {
101	break;
102	}

125	$result = $default;
126
127	if (!strpos($path, '.')) {
128	+ return (isset($this->data->{$path}) && !is_null($this->data->{$path})) ? $this->data->{$path} : $default;
129	}
130	// Explode the registry path into an array
131	$nodes = explode('.', $path);

135	$found = false;
136	// Traverse the registry to find the correct node for the result.
137	foreach ($nodes as $n) {
138	+ if (is_object($node) && isset($node->{$n})) {
139	+ $node = $node->{$n};
140	$found = true;
141	} elseif (is_array($node) && array_key_exists($n, $node)) {
142	$node = $node[$n];

312
313	// Traverse the registry to find the correct node for the result.
314	for ($i = 0, $n = count($nodes) - 1; $i < $n; $i++) {
315	+ if (!isset($node->{$nodes[$i]}) && ($i != $n)) {
316	+ $node->{$nodes[$i]} = new stdClass();
317	}
318	+ $node = $node->{$nodes[$i]};
319	}
320
321	// Get the old value if exists so we can return it
322	+ $result = $node->{$nodes[$i]} = $value;
323	}
324
325	return $result;

388
389	foreach ($data as $k => $v) {
390	if ((is_array($v) && GantryArrayHelper::isAssociative($v)) \|\| is_object($v)) {
391	+ $parent->{$k} = new stdClass();
392	+ $this->bindData($parent->{$k}, $v);
393	} else {
394	+ $parent->{$k} = $v;
395	}
396	}
397	}

core/utilities/gantrysimplexmlelement.class.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: gantrysimplexmlelement.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -49,7 +49,7 @@ class GantrySimpleXMLElement extends SimpleXMLElement
49	*/
50	public function getAttribute($name)
51	{
52	- return (string)$this->attributes()~~->$~~name;
53	}
54
55	/**


1	<?php
2	/**
3	+ * @version $Id: gantrysimplexmlelement.class.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

49	*/
50	public function getAttribute($name)
51	{
52	+ return (string)$this->attributes()->{$name};
53	}
54
55	/**

core/utilities/gantryxml.class.php CHANGED Viewed

	@@ -1,14 +1,14 @@
1	<?php
2	/**
3	*
4	- * @version $Id: gantryxml.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
5	* @author RocketTheme http://www.rockettheme.com
6	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
7	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
8	*
9	* original copyright
10	*
11	- * @version $Id: gantryxml.class.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
12	* @package Joomla.Framework
13	* @subpackage Utilities
14	* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
	@@ -545,8 +545,8 @@ class GantryXMLElement
545	{
546	//If there is no array already set for the tag name being added,
547	//create an empty array for it
548	- if (!isset($this~~->$~~name)) {
549	- $this~~->$~~name = array();
550	}
551
552	// set the level if not already specified


1	<?php
2	/**
3	*
4	+ * @version $Id: gantryxml.class.php 61659 2016-03-08 17:22:12Z matias $
5	* @author RocketTheme http://www.rockettheme.com
6	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
7	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
8	*
9	* original copyright
10	*
11	+ * @version $Id: gantryxml.class.php 61659 2016-03-08 17:22:12Z matias $
12	* @package Joomla.Framework
13	* @subpackage Utilities
14	* @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.

545	{
546	//If there is no array already set for the tag name being added,
547	//create an empty array for it
548	+ if (!isset($this->{$name})) {
549	+ $this->{$name} = array();
550	}
551
552	// set the level if not already specified

core/utilities/registry/format/ini.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: ini.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -114,7 +114,7 @@ class GantryRegistryFormatINI extends GantryRegistryFormat
114	// If we are processing sections and the line is a section add the object and continue.
115	if (($line[0] == '[') && ($line[$length - 1] == ']')) {
116	$section = substr($line, 1, $length - 2);
117	- $obj~~->$~~section = new stdClass();
118	continue;
119	}
120	} else if ($line{0} == '[') {
	@@ -164,9 +164,9 @@ class GantryRegistryFormatINI extends GantryRegistryFormat
164
165	// If a section is set add the key/value to the section, otherwise top level.
166	if ($section) {
167	- $obj~~->$~~section~~->$~~key = $value;
168	} else {
169	- $obj~~->$~~key = $value;
170	}
171	}
172


1	<?php
2	/**
3	+ * @version $Id: ini.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

114	// If we are processing sections and the line is a section add the object and continue.
115	if (($line[0] == '[') && ($line[$length - 1] == ']')) {
116	$section = substr($line, 1, $length - 2);
117	+ $obj->{$section} = new stdClass();
118	continue;
119	}
120	} else if ($line{0} == '[') {

164
165	// If a section is set add the key/value to the section, otherwise top level.
166	if ($section) {
167	+ $obj->{$section}->{$key} = $value;
168	} else {
169	+ $obj->{$key} = $value;
170	}
171	}
172

core/utilities/registry/format/xml.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: xml.php ~~59361~~ ~~2013~~-03-13 23:10:~~27Z~~ ~~btowles~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -78,7 +78,7 @@ class GantryRegistryFormatXML extends GantryRegistryFormat
78	$xml = simplexml_load_string($data);
79
80	foreach ($xml->children() as $node) {
81	- $obj~~->$~~node['name'] = $this->_getValueFromNode($node);
82	}
83
84	return $obj;
	@@ -119,7 +119,7 @@ class GantryRegistryFormatXML extends GantryRegistryFormat
119	default:
120	$value = new stdClass;
121	foreach ($node->children() as $child) {
122	- $value~~->$~~child['name'] = $this->_getValueFromNode($child);
123	}
124	break;
125	}


1	<?php
2	/**
3	+ * @version $Id: xml.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

78	$xml = simplexml_load_string($data);
79
80	foreach ($xml->children() as $node) {
81	+ $obj->{$node['name']} = $this->_getValueFromNode($node);
82	}
83
84	return $obj;

119	default:
120	$value = new stdClass;
121	foreach ($node->children() as $child) {
122	+ $value->{$child['name']} = $this->_getValueFromNode($child);
123	}
124	break;
125	}

functions.php CHANGED Viewed

	@@ -168,7 +168,7 @@ function gantry_construct()
168	/**
169	* @name GANTRY_VERSION
170	*/
171	- define('GANTRY_VERSION', '4.1.10');
172
173
174	if (!defined('DS')) {
	@@ -192,7 +192,7 @@ function gantry_construct()
192
193	// Fix stuff on 4.4
194	if(!get_option('gantry_4_1_10_execute_scripts') && $wp_version >= '4.4') {
195	- $cache_groups = array('gantry', 'Gantry', 'GantryAdmin-4.1.10', 'GantryLess', 'GantryAdminLess');
196	foreach($cache_groups as $group) {
197	$cache_handler = GantryCache::getCache( $group, 0, true );
198	$cache_handler->clearGroupCache();


168	/**
169	* @name GANTRY_VERSION
170	*/
171	+ define('GANTRY_VERSION', '4.1.11');
172
173
174	if (!defined('DS')) {

192
193	// Fix stuff on 4.4
194	if(!get_option('gantry_4_1_10_execute_scripts') && $wp_version >= '4.4') {
195	+ $cache_groups = array('gantry', 'Gantry', 'GantryAdmin-4.1.11', 'GantryLess', 'GantryAdminLess');
196	foreach($cache_groups as $group) {
197	$cache_handler = GantryCache::getCache( $group, 0, true );
198	$cache_handler->clearGroupCache();

gantry.php CHANGED Viewed

	@@ -10,7 +10,7 @@
10	Plugin Name: Gantry 4 Framework
11	Plugin URI: http://www.gantry.org/
12	Description: This is a Framework to support easily modifiable themes that are very extensible.
13	- Version: 4.1.10
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 4 Framework
11	Plugin URI: http://www.gantry.org/
12	Description: This is a Framework to support easily modifiable themes that are very extensible.
13	+ Version: 4.1.11
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/buddypress.php CHANGED Viewed

	@@ -100,7 +100,7 @@ class GantryGizmoBuddyPress extends GantryGizmo {
100	if ( bp_current_component() ) {
101	$component = bp_current_component();
102	$component = 'is_bp_' . $component;
103	- $wp_query~~->$~~component = true;
104	}
105	}
106


100	if ( bp_current_component() ) {
101	$component = bp_current_component();
102	$component = 'is_bp_' . $component;
103	+ $wp_query->{$component} = true;
104	}
105	}
106

libs/phpQuery.php CHANGED Viewed

	@@ -105,7 +105,7 @@ class DOMEvent {
105	public $data = null;
106	public function __construct($data) {
107	foreach($data as $k => $v) {
108	- $this~~->$~~k = $v;
109	}
110	if (! $this->timeStamp)
111	$this->timeStamp = time();
	@@ -1232,7 +1232,7 @@ class phpQueryObject
1232	return $this->size();
1233	break;
1234	default:
1235	- return $this~~->$~~attr;
1236	}
1237	}
1238	/**


105	public $data = null;
106	public function __construct($data) {
107	foreach($data as $k => $v) {
108	+ $this->{$k} = $v;
109	}
110	if (! $this->timeStamp)
111	$this->timeStamp = time();

1232	return $this->size();
1233	break;
1234	default:
1235	+ return $this->{$attr};
1236	}
1237	}
1238	/**

readme.txt CHANGED Viewed

	@@ -4,7 +4,7 @@ Author URI: http://gantry.org
4	Tags: gantry, framework, template, theme, widgets, flexible, extensible, configurable, 960px, grid, columns, powerful, buddypress
5	Requires at least: 3.2
6	Tested up to: 4.6.1
7	- Stable tag: 4.1.10
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
	@@ -89,6 +89,9 @@ Once you downloaded and installed Gantry 4 Framework plugin, please download als
89
90	== Changelog ==
91



92	= 4.1.10 =
93	* WARNING! - PLEASE MAKE A DATABASE BACKUP BEFORE UPDATING
94	* Auto execute script that will attempt to fix the widgets with wrong IDs in WP 4.4. Some widgets with bad data inside of them might need to be placed again.
	@@ -431,6 +434,9 @@ Once you downloaded and installed Gantry 4 Framework plugin, please download als
431
432	== Upgrade Notice ==
433



434	= 4.1.10 =
435	* WARNING! - PLEASE MAKE A DATABASE BACKUP BEFORE UPDATING! This update will automatically execute a script that will attempt to fix wrong Widget IDs in WP 4.4. Some widgets with bad data inside of them might need to be placed again.
436


4	Tags: gantry, framework, template, theme, widgets, flexible, extensible, configurable, 960px, grid, columns, powerful, buddypress
5	Requires at least: 3.2
6	Tested up to: 4.6.1
7	+ Stable tag: 4.1.11
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

89
90	== Changelog ==
91
92	+ = 4.1.11 =
93	+ * PHP 7 compatibility fixes
94	+
95	= 4.1.10 =
96	* WARNING! - PLEASE MAKE A DATABASE BACKUP BEFORE UPDATING
97	* Auto execute script that will attempt to fix the widgets with wrong IDs in WP 4.4. Some widgets with bad data inside of them might need to be placed again.

434
435	== Upgrade Notice ==
436
437	+ = 4.1.11 =
438	+ Please remember to create a full site backup (files + database) before performing update.
439	+
440	= 4.1.10 =
441	* WARNING! - PLEASE MAKE A DATABASE BACKUP BEFORE UPDATING! This update will automatically execute a script that will attempt to fix wrong Widget IDs in WP 4.4. Some widgets with bad data inside of them might need to be placed again.
442

widgets/breadcrumbs.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 4.1.10 ~~January~~ 7, 2016
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only


1	<?php
2	/**
3	+ * @version 4.1.11 November 21, 2016
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

widgets/loginbutton.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 4.1.10 ~~January~~ 7, 2016
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only


1	<?php
2	/**
3	+ * @version 4.1.11 November 21, 2016
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

widgets/loginform.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 4.1.10 ~~January~~ 7, 2016
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only


1	<?php
2	/**
3	+ * @version 4.1.11 November 21, 2016
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

widgets/menu.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version $Id: menu.php ~~60832~~ ~~2014~~-05-12 09:47:~~23Z~~ ~~jakub~~ $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
	@@ -314,7 +314,7 @@ class GantryWidgetMenu extends GantryWidget
314	if (array_key_exists($item->ID, $menu_options)) {
315	$item_options = $menu_options[$item->ID];
316	foreach ($item_options as $item_option => $item_option_value) {
317	- $item~~->$~~item_option = $item_option_value;
318	}
319	}
320	$modded_items[$key] = $item;


1	<?php
2	/**
3	+ * @version $Id: menu.php 61659 2016-03-08 17:22:12Z matias $
4	* @author RocketTheme http://www.rockettheme.com
5	* @copyright Copyright (C) 2007 - 2016 RocketTheme, LLC
6	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

314	if (array_key_exists($item->ID, $menu_options)) {
315	$item_options = $menu_options[$item->ID];
316	foreach ($item_options as $item_option => $item_option_value) {
317	+ $item->{$item_option} = $item_option_value;
318	}
319	}
320	$modded_items[$key] = $item;