diff --git a/recaptcha.php b/recaptcha.php index a6efcd3..8b6a414 100644 --- a/recaptcha.php +++ b/recaptcha.php @@ -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')); } diff --git a/wp-plugin.php b/wp-plugin.php index 4917189..44a88ef 100644 --- a/wp-plugin.php +++ b/wp-plugin.php @@ -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); @@ -129,4 +129,4 @@ protected function is_authority() { } } -?> \ No newline at end of file +?>