Skip to content

Commit

Permalink
1.5 stable
Browse files Browse the repository at this point in the history
  • Loading branch information
RavanH committed Dec 7, 2016
1 parent 7b83c3f commit ed9e841
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
20 changes: 10 additions & 10 deletions jetpack-module-control.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Text Domain: jetpack-module-control
* Domain Path: /languages
* License: GPL2+
* Version: 1.5-alpha
* Version: 1.5
*/

/*
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -282,12 +282,12 @@ public function subsite_override_settings() {
<?php disabled( $disabled ); ?>>
<?php _e('Allow individual site administrators to manage their own settings for Jetpack Module Control','jetpack-module-control'); ?>
</label>

<?php
} // END subsite_override_settings()

/**
* Checks if subsite override is allowed on multisite.
* Checks if subsite override is allowed on multisite.
*
* @uses get_site_option()
* @return bool jetpack_mc_subsite_override network option. Always true if single site installation
Expand Down Expand Up @@ -368,7 +368,7 @@ public function manual_control_settings() {
public function manual_control( $modules ) {

// check if subsite override allowed
if( $this->subsite_override() ) {
if( $this->subsite_override() ) {
$option = get_option('jetpack_mc_manual_control');
} else {
$option = false;
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -694,7 +694,7 @@ public function show_network_settings() {
?>
</td>
</tr>

<tr>
<th scope="row"><?php _e('Manual Control','jetpack-module-control'); ?></th>
<td>
Expand Down
8 changes: 5 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 =
Expand Down

0 comments on commit ed9e841

Please sign in to comment.