diff --git a/Gruntfile.js b/Gruntfile.js index 38f6c2a..230ed93 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -20,7 +20,7 @@ module.exports = function(grunt) { // I18n - + // Add text domain as last argument of i18n functions addtextdomain: { php: { @@ -43,15 +43,15 @@ module.exports = function(grunt) { '_e:1,2d', '_x:1,2c,3d', '_ex:1,2c,3d', - '_n:1,2,4d', + '_n:1,2,4d', '_nx:1,2,4c,5d', '_n_noop:1,2,3d', '_nx_noop:1,2,3c,4d', - 'esc_attr__:1,2d', + 'esc_attr__:1,2d', 'esc_html__:1,2d', - 'esc_attr_e:1,2d', + 'esc_attr_e:1,2d', 'esc_html_e:1,2d', - 'esc_attr_x:1,2c,3d', + 'esc_attr_x:1,2c,3d', 'esc_html_x:1,2c,3d' ] }, @@ -75,7 +75,7 @@ module.exports = function(grunt) { pot.headers['last-translator'] = 'StudioPress '; pot.headers['language-team'] = 'English '; pot.headers['plural-forms'] = 'nplurals=2; plural=n != 1;'; - pot.headers['x-generator'] = 'grunt-wp-i18n 0.4.4'; + pot.headers['x-generator'] = 'grunt-wp-i18n'; pot.headers['x-poedit-basepath'] = '.'; pot.headers['x-poedit-language'] = 'English'; pot.headers['x-poedit-country'] = 'UNITED STATES'; diff --git a/includes/term.php b/includes/term.php index 74d08b6..562f50a 100644 --- a/includes/term.php +++ b/includes/term.php @@ -37,7 +37,7 @@ function ss_term_sidebar($tag, $taxonomy) { $info ) { - printf( '', esc_html( $id ), selected( $id, $tag->meta['_ss_sidebar'] , false), esc_html( $info['name'] ) ); + printf( '', esc_html( $id ), selected( $id, get_term_meta( $tag->term_id, '_ss_sidebar', true ), false), esc_html( $info['name'] ) ); } ?> @@ -54,7 +54,7 @@ function ss_term_sidebar($tag, $taxonomy) { $info ) { - printf( '', esc_html( $id ), selected( $id, $tag->meta['_ss_sidebar_alt'] , false), esc_html( $info['name'] ) ); + printf( '', esc_html( $id ), selected( $id, get_term_meta( $tag->term_id, '_ss_sidebar_alt', true ), false), esc_html( $info['name'] ) ); } ?> diff --git a/includes/views/edit.php b/includes/views/edit.php index 3223347..9bd2624 100644 --- a/includes/views/edit.php +++ b/includes/views/edit.php @@ -22,7 +22,7 @@ screen_icon( 'themes' ); ?> - +

diff --git a/languages/genesis-simple-sidebars.pot b/languages/genesis-simple-sidebars.pot index 1c55ce6..16e7420 100644 --- a/languages/genesis-simple-sidebars.pot +++ b/languages/genesis-simple-sidebars.pot @@ -1,17 +1,17 @@ -# Copyright (C) 2015 Nathan Rice +# Copyright (C) 2016 Nathan Rice # This file is distributed under the GNU General Public License v2.0 (or later). msgid "" msgstr "" -"Project-Id-Version: Genesis Simple Sidebars 2.0.2\n" +"Project-Id-Version: Genesis Simple Sidebars 2.0.3\n" "Report-Msgid-Bugs-To: StudioPress \n" -"POT-Creation-Date: 2015-09-29 20:53:32+00:00\n" +"POT-Creation-Date: 2016-02-24 19:51:21+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n" "Last-Translator: StudioPress \n" "Language-Team: English \n" -"X-Generator: grunt-wp-i18n 0.4.4\n" +"X-Generator: grunt-wp-i18n\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Basepath: .\n" "X-Poedit-Language: English\n" diff --git a/package.json b/package.json index eea18fa..ed80923 100644 --- a/package.json +++ b/package.json @@ -7,21 +7,21 @@ }, "dependencies": {}, "devDependencies": { - "grunt": "^0.4.5", - "grunt-autoprefixer": "^0.8.1", - "grunt-checktextdomain": "^0.1.1", - "grunt-contrib-cssmin": "^0.10.0", - "grunt-contrib-imagemin": "^0.7.1", - "grunt-contrib-jshint": "^0.10.0", - "grunt-contrib-uglify": "^0.5.0", - "grunt-contrib-watch": "^0.6.1", - "grunt-csscomb": "~2.0.1", - "grunt-jsbeautifier": "^0.2.7", - "grunt-jsvalidate": "^0.2.2", - "grunt-phplint": "0.0.5", - "grunt-styledocco": "^0.1.4", - "grunt-wp-i18n": "^0.5.3", - "load-grunt-tasks": "^3.3.0" + "grunt": "*", + "grunt-autoprefixer": "*", + "grunt-checktextdomain": "*", + "grunt-contrib-cssmin": "*", + "grunt-contrib-imagemin": "*", + "grunt-contrib-jshint": "*", + "grunt-contrib-uglify": "*", + "grunt-contrib-watch": "*", + "grunt-csscomb": "*", + "grunt-jsbeautifier": "*", + "grunt-jsvalidate": "*", + "grunt-phplint": "*", + "grunt-styledocco": "*", + "grunt-wp-i18n": "*", + "load-grunt-tasks": "*" }, "plugin": { "name": "Genesis Simple Sidebars", @@ -29,7 +29,7 @@ "description": "Genesis Simple Sidebars allows you to easily create and use new sidebar widget areas.", "author": "StudioPress", "authoruri": "http://www.studiopress.com/", - "version": "2.0.2", + "version": "2.0.3", "license": "GPL-2.0+", "licenseuri": "http://www.gnu.org/licenses/gpl-2.0.html", "textdomain": "genesis-simple-sidebars" diff --git a/plugin.php b/plugin.php index 13f5e46..742a985 100644 --- a/plugin.php +++ b/plugin.php @@ -7,9 +7,9 @@ Author: Nathan Rice Author URI: http://www.nathanrice.net/ Text Domain: genesis-simple-sidebars -Domain Path: /languages/ +Domain Path: /languages -Version: 2.0.2 +Version: 2.0.3 License: GNU General Public License v2.0 (or later) License URI: http://www.opensource.org/licenses/gpl-license.php @@ -30,8 +30,8 @@ register_activation_hook( __FILE__, 'ss_activation_check' ); */ function ss_activation_check() { - if ( ! defined( 'PARENT_THEME_VERSION' ) || ! version_compare( PARENT_THEME_VERSION, '2.0.0', '>=' ) ) - ss_deactivate( '2.0.0', '3.6' ); + if ( ! defined( 'PARENT_THEME_VERSION' ) || ! version_compare( PARENT_THEME_VERSION, '2.2.7', '>=' ) ) + ss_deactivate( '2.2.7', '4.4.2' ); } @@ -42,7 +42,7 @@ function ss_activation_check() { * * @since 1.0.0 */ -function ss_deactivate( $genesis_version = '1.8.0', $wp_version = '3.3' ) { +function ss_deactivate( $genesis_version = '2.2.7', $wp_version = '4.4.2' ) { deactivate_plugins( plugin_basename( __FILE__ ) ); wp_die( sprintf( __( 'Sorry, you cannot run Simple Sidebars without WordPress %s and Genesis %s, or greater.', 'genesis-simple-sidebars' ), $wp_version, 'http://my.studiopress.com/?download_id=91046d629e74d525b3f2978e404e7ffa', $genesis_version ) ); @@ -169,39 +169,21 @@ function ss_do_sidebar_alt() { */ function ss_do_one_sidebar( $sidebar_key = '_ss_sidebar' ) { - static $taxonomies = null; - if ( is_singular() && $sidebar_key = genesis_get_custom_field( $sidebar_key ) ) { - if ( dynamic_sidebar( $sidebar_key ) ) return true; - } - - if ( is_category() ) { - $term = get_term( get_query_var( 'cat' ), 'category' ); - if ( isset( $term->meta[$sidebar_key] ) && dynamic_sidebar( $term->meta[$sidebar_key] ) ) return true; - } - - if ( is_tag() ) { - $term = get_term( get_query_var( 'tag_id' ), 'post_tag' ); - if ( isset( $term->meta[$sidebar_key] ) && dynamic_sidebar( $term->meta[$sidebar_key] ) ) return true; - } - - if ( is_tax() ) { - if ( null === $taxonomies ) - $taxonomies = ss_get_taxonomies(); - - foreach ( $taxonomies as $tax ) { - if ( 'post_tag' == $tax || 'category' == $tax ) - continue; - - if ( is_tax( $tax ) ) { - $obj = get_queried_object(); - $term = get_term( $obj->term_id, $tax ); - if ( isset( $term->meta[$sidebar_key] ) && dynamic_sidebar( $term->meta[$sidebar_key] ) ) return true; - break; - } + if ( dynamic_sidebar( $sidebar_key ) ) { + return true; } } + if ( is_tax() || is_category() || is_tag() ) { + + if ( $sidebar_key = get_term_meta( get_queried_object()->term_id, $sidebar_key, true ) ) { + dynamic_sidebar( $sidebar_key ); + return true; + } + + } + return false; } diff --git a/readme.txt b/readme.txt index 0b65502..2caec34 100644 --- a/readme.txt +++ b/readme.txt @@ -1,10 +1,10 @@ === Plugin Name === -Contributors: nathanrice, wpmuguru +Contributors: nathanrice, wpmuguru, studiopress Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5553118 Tags: hooks, genesis, genesiswp, studiopress -Requires at least: 3.6 -Tested up to: 4.3.1 -Stable tag: 2.0.2 +Requires at least: 4.4.2 +Tested up to: 4.4.2 +Stable tag: 2.0.3 This plugin allows you to create multiple, dynamic widget areas, and assign those widget areas to sidebar locations within the Genesis Framework on a per post, per page, or per tag/category archive basis. @@ -37,6 +37,10 @@ Not in the way you're probably thinking. The markup surrounding the widget area == Changelog == += 2.0.3 = +* Update for WordPress 4.4+ and Genesis 2.2.7+ +* DO NOT upgrade to 2.0.3 unless you are running WordPress 4.4+ AND Genesis 2.2.7+ + = 2.0.2 = * Change text domain, update POT file.