Unyson - Version 2.6.10

Version Description

  • Fixed #2216, #2212, #2214
Download this release

Release Info

Developer Unyson
Plugin Icon 128x128 Unyson
Version 2.6.10
Comparing to
See all releases

Code changes from version 2.6.9 to 2.6.10

Files changed (6) hide show
  1. framework/core/components/backend/class-fw-settings-form-theme.php +13 -9
  2. framework/helpers/class-fw-db-options-model.php +7 -3
  3. framework/includes/option-types/multi-select/class-fw-option-type-multi-select.php +1 -1
  4. framework/manifest.php +1 -1
  5. readme.txt +6 -2
  6. unyson.php +1 -1
framework/core/components/backend/class-fw-settings-form-theme.php CHANGED
@@ -65,18 +65,22 @@ class FW_Settings_Form_Theme extends FW_Settings_Form {
65
  do {
66
  global $menu, $submenu;
67
 
68
- foreach ($menu as $_menu) {
69
- if ($_menu[2] === fw()->backend->_get_settings_page_slug()) {
70
- $title = $_menu[0];
71
- break 2;
 
 
72
  }
73
  }
74
 
75
- foreach ($submenu as $_menu) {
76
- foreach ($_menu as $_submenu) {
77
- if ($_submenu[2] === fw()->backend->_get_settings_page_slug()) {
78
- $title = $_submenu[0];
79
- break 3;
 
 
80
  }
81
  }
82
  }
65
  do {
66
  global $menu, $submenu;
67
 
68
+ if (is_array($menu)) {
69
+ foreach ($menu as $_menu) {
70
+ if ($_menu[2] === fw()->backend->_get_settings_page_slug()) {
71
+ $title = $_menu[0];
72
+ break 2;
73
+ }
74
  }
75
  }
76
 
77
+ if (is_array($submenu)) {
78
+ foreach ($submenu as $_menu) {
79
+ foreach ($_menu as $_submenu) {
80
+ if ($_submenu[2] === fw()->backend->_get_settings_page_slug()) {
81
+ $title = $_submenu[0];
82
+ break 3;
83
+ }
84
  }
85
  }
86
  }
framework/helpers/class-fw-db-options-model.php CHANGED
@@ -144,7 +144,7 @@ abstract class FW_Db_Options_Model {
144
  return $default_value;
145
  }
146
  } else {
147
- if ( is_null( fw_akg( $sub_keys, $values[ $option_id ] ) ) ) {
148
  return $default_value;
149
  }
150
  }
@@ -194,9 +194,13 @@ abstract class FW_Db_Options_Model {
194
  return (empty($values) && is_array($default_value)) ? $default_value : $values;
195
  } else {
196
  if (is_null($sub_keys)) {
197
- return isset($values[$option_id]) ? $values[$option_id] : $default_value;
 
 
198
  } else {
199
- return fw_akg($sub_keys, $values[$option_id], $default_value);
 
 
200
  }
201
  }
202
  }
144
  return $default_value;
145
  }
146
  } else {
147
+ if ( ! isset($values[ $option_id ]) || is_null( fw_akg( $sub_keys, $values[ $option_id ] ) ) ) {
148
  return $default_value;
149
  }
150
  }
194
  return (empty($values) && is_array($default_value)) ? $default_value : $values;
195
  } else {
196
  if (is_null($sub_keys)) {
197
+ return isset($values[$option_id])
198
+ ? $values[$option_id]
199
+ : $default_value;
200
  } else {
201
+ return isset($values[$option_id])
202
+ ? fw_akg($sub_keys, $values[$option_id], $default_value)
203
+ : $default_value;
204
  }
205
  }
206
  }
framework/includes/option-types/multi-select/class-fw-option-type-multi-select.php CHANGED
@@ -280,7 +280,7 @@ if ( ! class_exists( 'FW_Option_Type_Multi_Select' ) ):
280
  $terms = $wpdb->get_results(
281
  "SELECT terms.term_id, terms.name " .
282
  "FROM $wpdb->terms as terms, $wpdb->term_taxonomy as taxonomies " .
283
- "WHERE taxonomies.taxonomy IN ('" . implode( "', ", $source ) . "') " .
284
  "AND terms.term_id = taxonomies.term_id " .
285
  "AND taxonomies.term_id = taxonomies.term_taxonomy_id"
286
  );
280
  $terms = $wpdb->get_results(
281
  "SELECT terms.term_id, terms.name " .
282
  "FROM $wpdb->terms as terms, $wpdb->term_taxonomy as taxonomies " .
283
+ "WHERE taxonomies.taxonomy IN ('" . implode( "', '", $source ) . "') " .
284
  "AND terms.term_id = taxonomies.term_id " .
285
  "AND taxonomies.term_id = taxonomies.term_taxonomy_id"
286
  );
framework/manifest.php CHANGED
@@ -4,4 +4,4 @@ $manifest = array();
4
 
5
  $manifest['name'] = __('Unyson', 'fw');
6
 
7
- $manifest['version'] = '2.6.9';
4
 
5
  $manifest['name'] = __('Unyson', 'fw');
6
 
7
+ $manifest['version'] = '2.6.10';
readme.txt CHANGED
@@ -2,8 +2,8 @@
2
  Contributors: unyson
3
  Tags: page builder, grid, layout, responsive, back up, backup, db backup, dump, migrate, schedule, search engine optimization, seo, media, slideshow, shortcode, slide, slideshare, slideshow, google sitemaps, sitemaps, analytics, google analytics, calendar, event, events, google maps, learning, lessons, sidebars, breadcrumbs, review, portfolio, framework
4
  Requires at least: 4.4
5
- Tested up to: 4.6
6
- Stable tag: 2.6.9
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -83,6 +83,9 @@ Yes; Unyson will work with any theme.
83
 
84
  == Changelog ==
85
 
 
 
 
86
  = 2.6.9 =
87
  * Fixed [#1743](https://github.com/ThemeFuse/Unyson/issues/1743), [#2143](https://github.com/ThemeFuse/Unyson/issues/2143), [#2148](https://github.com/ThemeFuse/Unyson/issues/2148), [#2154](https://github.com/ThemeFuse/Unyson/pull/2154), [#2159](https://github.com/ThemeFuse/Unyson/pull/2159), [#2139](https://github.com/ThemeFuse/Unyson/issues/2139), [#2167](https://github.com/ThemeFuse/Unyson/issues/2167), [#2179](https://github.com/ThemeFuse/Unyson/issues/2179), [#2180](https://github.com/ThemeFuse/Unyson/pull/2180)
88
 
@@ -343,3 +346,4 @@ Yes; Unyson will work with any theme.
343
  * Options can be used in [Customizer](https://codex.wordpress.org/Theme_Customization_API) [#410](https://github.com/ThemeFuse/Unyson/issues/410)
344
  * Fixed [#77](https://github.com/ThemeFuse/Unyson/issues/77)
345
 
 
2
  Contributors: unyson
3
  Tags: page builder, grid, layout, responsive, back up, backup, db backup, dump, migrate, schedule, search engine optimization, seo, media, slideshow, shortcode, slide, slideshare, slideshow, google sitemaps, sitemaps, analytics, google analytics, calendar, event, events, google maps, learning, lessons, sidebars, breadcrumbs, review, portfolio, framework
4
  Requires at least: 4.4
5
+ Tested up to: 4.7
6
+ Stable tag: 2.6.10
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
83
 
84
  == Changelog ==
85
 
86
+ = 2.6.10 =
87
+ * Fixed [#2216](https://github.com/ThemeFuse/Unyson/issues/2216), [#2212](https://github.com/ThemeFuse/Unyson/issues/2212), [#2214](https://github.com/ThemeFuse/Unyson/issues/2214)
88
+
89
  = 2.6.9 =
90
  * Fixed [#1743](https://github.com/ThemeFuse/Unyson/issues/1743), [#2143](https://github.com/ThemeFuse/Unyson/issues/2143), [#2148](https://github.com/ThemeFuse/Unyson/issues/2148), [#2154](https://github.com/ThemeFuse/Unyson/pull/2154), [#2159](https://github.com/ThemeFuse/Unyson/pull/2159), [#2139](https://github.com/ThemeFuse/Unyson/issues/2139), [#2167](https://github.com/ThemeFuse/Unyson/issues/2167), [#2179](https://github.com/ThemeFuse/Unyson/issues/2179), [#2180](https://github.com/ThemeFuse/Unyson/pull/2180)
91
 
346
  * Options can be used in [Customizer](https://codex.wordpress.org/Theme_Customization_API) [#410](https://github.com/ThemeFuse/Unyson/issues/410)
347
  * Fixed [#77](https://github.com/ThemeFuse/Unyson/issues/77)
348
 
349
+
unyson.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Unyson
4
  * Plugin URI: http://unyson.io/
5
  * Description: A free drag & drop framework that comes with a bunch of built in extensions that will help you develop premium themes fast & easy.
6
- * Version: 2.6.9
7
  * Author: ThemeFuse
8
  * Author URI: http://themefuse.com
9
  * License: GPL2+
3
  * Plugin Name: Unyson
4
  * Plugin URI: http://unyson.io/
5
  * Description: A free drag & drop framework that comes with a bunch of built in extensions that will help you develop premium themes fast & easy.
6
+ * Version: 2.6.10
7
  * Author: ThemeFuse
8
  * Author URI: http://themefuse.com
9
  * License: GPL2+