@@ -27,6 +27,9 @@ |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | |
| 30 | + /** |
|
| 31 | + * @param string $key |
|
| 32 | + */ |
|
| 30 | 33 | protected function get_locale( $key ) { |
| 31 | 34 | if ( 'locale' == $key ) { |
| 32 | 35 | if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) { |
@@ -4,12 +4,27 @@ |
||
| 4 | 4 | require_once dirname( __FILE__ ) . '/class.json-api-site-base.php'; |
| 5 | 5 | |
| 6 | 6 | abstract class Abstract_Jetpack_Site extends SAL_Site { |
| 7 | + |
|
| 8 | + /** |
|
| 9 | + * @param string $name |
|
| 10 | + */ |
|
| 7 | 11 | abstract protected function get_constant( $name ); |
| 8 | 12 | |
| 13 | + /** |
|
| 14 | + * @param string $feature_name |
|
| 15 | + */ |
|
| 9 | 16 | abstract protected function current_theme_supports( $feature_name ); |
| 10 | 17 | |
| 18 | + /** |
|
| 19 | + * @param string $feature_name |
|
| 20 | + */ |
|
| 11 | 21 | abstract protected function get_theme_support( $feature_name ); |
| 12 | 22 | |
| 23 | + /** |
|
| 24 | + * @param string $name |
|
| 25 | + * |
|
| 26 | + * @return string |
|
| 27 | + */ |
|
| 13 | 28 | abstract protected function get_mock_option( $name ); |
| 14 | 29 | |
| 15 | 30 | abstract protected function get_jetpack_version(); |
@@ -181,7 +181,7 @@ |
||
| 181 | 181 | /** |
| 182 | 182 | * Backend function to abstract the xmlrpc function calls to wpcom. |
| 183 | 183 | * |
| 184 | - * @param $endpoint |
|
| 184 | + * @param string $endpoint |
|
| 185 | 185 | * @param $error_message |
| 186 | 186 | */ |
| 187 | 187 | function __process_ajax_proxy_request( $endpoint, $error_message ) { |
@@ -102,9 +102,9 @@ |
||
| 102 | 102 | * Parameters are the same as preg_replace, with an added optional search param for improved performance |
| 103 | 103 | * |
| 104 | 104 | * @param String $pattern |
| 105 | - * @param String $replacement |
|
| 106 | 105 | * @param String $content |
| 107 | 106 | * @param String $search |
| 107 | + * @param string $callback |
|
| 108 | 108 | * @return String $content |
| 109 | 109 | */ |
| 110 | 110 | function jetpack_preg_replace_callback_outside_tags( $pattern, $callback, $content, $search = null ) { |
@@ -137,6 +137,10 @@ |
||
| 137 | 137 | return 'authorized'; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | + /** |
|
| 141 | + * @param string $probable_file |
|
| 142 | + * @param string $probable_title |
|
| 143 | + */ |
|
| 140 | 144 | public static function deactivate_plugin( $probable_file, $probable_title ) { |
| 141 | 145 | include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); |
| 142 | 146 | if ( is_plugin_active( $probable_file ) ) { |
@@ -104,6 +104,7 @@ |
||
| 104 | 104 | * See: https://bugs.php.net/bug.php?id=66229 and https://github.com/php/php-src/commit/d1314893fd1325ca6aa0831101896e31135a2658 |
| 105 | 105 | * |
| 106 | 106 | * This function mirrors Jetpack_Data::php_bug_66229_check() in the WPCOM codebase. |
| 107 | + * @param string $ip |
|
| 107 | 108 | */ |
| 108 | 109 | public static function php_bug_66229_check( $ip ) { |
| 109 | 110 | if ( ! filter_var( $ip, FILTER_VALIDATE_IP ) ) { |
@@ -7077,19 +7077,4 @@ |
||
| 7077 | 7077 | $site_icon_id = Jetpack::get_option( 'site_icon_id' ); |
| 7078 | 7078 | if ( $site_icon_id ) { |
| 7079 | 7079 | // Update core's site icon |
| 7080 | - update_option( 'site_icon', $site_icon_id ); |
|
| 7081 | - |
|
| 7082 | - // Delete Jetpack's icon option. We still want the blavatar and attached data though. |
|
| 7083 | - delete_option( 'site_icon_id' ); |
|
| 7084 | - } |
|
| 7085 | - |
|
| 7086 | - // No need for Jetpack's site icon anymore |
|
| 7087 | - if ( Jetpack::is_module_active( 'site-icon' ) ) { |
|
| 7088 | - Jetpack::log( 'deactivate', 'site-icon' ); |
|
| 7089 | - Jetpack::deactivate_module( 'site-icon' ); |
|
| 7090 | - } |
|
| 7091 | - |
|
| 7092 | - return true; |
|
| 7093 | - } |
|
| 7094 | - |
|
| 7095 | -} |
|
| 7080 | + update_option( 'site_icon', $site_icon_id |
|
| 7096 | 7081 | \ No newline at end of file |