diff --git a/jetpack-module-control.php b/jetpack-module-control.php index 77bc801..ee25d1c 100644 --- a/jetpack-module-control.php +++ b/jetpack-module-control.php @@ -9,7 +9,7 @@ * Text Domain: jetpack-module-control * Domain Path: /languages * License: GPL2+ - * Version: 1.5-alpha + * Version: 1.5 */ /* @@ -67,7 +67,7 @@ class Jetpack_Module_Control { * @since 0.1 * @var string */ - public $version = '1.4.9'; + public $version = '1.5'; /** * Available modules array @@ -282,12 +282,12 @@ public function subsite_override_settings() { > - + subsite_override() ) { + if( $this->subsite_override() ) { $option = get_option('jetpack_mc_manual_control'); } else { $option = false; @@ -446,11 +446,11 @@ public function development_mode_settings() { public function development_mode() { // check if subsite override allowed if( $this->subsite_override() ) { - $option = get_option('jetpack_mc_development_mode'); + $option = get_option('jetpack_mc_development_mode'); } else { $option = false; } - + // if false, fall back on network settings if ( $option === false && is_multisite() ) { $option = get_site_option('jetpack_mc_development_mode'); @@ -569,9 +569,9 @@ public function blacklist_settings() { * @return Array Allowed modules after unsetting blacklisted modules from all modules array */ public function blacklist ( $modules ) { - + // check if subsite override allowed - if( $this->subsite_override() ) { + if( $this->subsite_override() ) { $blacklist = get_option('jetpack_mc_blacklist'); } else { $blacklist = false; @@ -694,7 +694,7 @@ public function show_network_settings() { ?> - + diff --git a/readme.txt b/readme.txt index 84a6ab5..5f79e0f 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=ravan Tags: Jetpack, jet pack, jetpack light, manual control, blacklist, blacklist jetpack modules, slim jetpack Stable tag: 1.4.2 Requires at least: 4.0 -Tested up to: 4.5 +Tested up to: 4.7 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -70,12 +70,14 @@ Please [contact me](http://status301.net/contact-en/) to submit your translation == Upgrade Notice == -= 1.4.2 = -Text domain name change. += 1.5 = +Allow site admins override, contributed by @harshit_ps == Changelog == = 1.5 = +Date: 2016/12/07 + * NEW: option to allow site admins override contributed by @harshit_ps https://github.com/RavanH/jetpack-module-control/pull/8 = 1.4.2 =