Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
merge huyz' changes. wpms network-wide disabled, but wpms blog-specif…
…ic should work out of the box now
  • Loading branch information
Jorge Israel Peña committed Feb 24, 2012
1 parent 942e47b commit 6f05fca
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions recaptcha.php
Expand Up @@ -528,8 +528,10 @@ function add_settings_page() {
if ($this->environment == Environment::WordPressMU && $this->is_authority())
add_submenu_page('wpmu-admin.php', 'WP-reCAPTCHA', 'WP-reCAPTCHA', 'manage_options', __FILE__, array(&$this, 'show_settings_page'));

/* re-add when we figure out a way to add network-wide settings in ms
if ($this->environment == Environment::WordPressMS && $this->is_authority())
add_submenu_page('ms-admin.php', 'WP-reCAPTCHA', 'WP-reCAPTCHA', 'manage_options', __FILE__, array(&$this, 'show_settings_page'));
*/

add_options_page('WP-reCAPTCHA', 'WP-reCAPTCHA', 'manage_options', __FILE__, array(&$this, 'show_settings_page'));
}
Expand Down
8 changes: 4 additions & 4 deletions wp-plugin.php
Expand Up @@ -91,21 +91,21 @@ abstract protected function register_default_options();

// option retrieval
static function retrieve_options($options_name) {
if (WPPlugin::determine_environment() == Environment::WordPressMU || WPPlugin::determine_environment() == Environment::WordPressMS)
if (WPPlugin::determine_environment() == Environment::WordPressMU)
return get_site_option($options_name);
else
return get_option($options_name);
}

static function remove_options($options_name) {
if (WPPlugin::determine_environment() == Environment::WordPressMU || WPPlugin::determine_environment() == Environment::WordPressMS)
if (WPPlugin::determine_environment() == Environment::WordPressMU)
return delete_site_option($options_name);
else
return delete_option($options_name);
}

static function add_options($options_name, $options) {
if (WPPlugin::determine_environment() == Environment::WordPressMU || WPPlugin::determine_environment() == Environment::WordPressMS)
if (WPPlugin::determine_environment() == Environment::WordPressMU)
return add_site_option($options_name, $options);
else
return add_option($options_name, $options);
Expand All @@ -129,4 +129,4 @@ protected function is_authority() {
}
}

?>
?>

0 comments on commit 6f05fca

Please sign in to comment.