Add access modifier (`public`) to methods and members of `WP_Upgrader_Skin` and its subclasses.
See #27881, #22234. git-svn-id: https://develop.svn.wordpress.org/trunk@28495 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
parent
b1a09cf65d
commit
17cabb1d8e
|
|
@ -16,29 +16,29 @@
|
|||
*/
|
||||
class WP_Upgrader_Skin {
|
||||
|
||||
var $upgrader;
|
||||
var $done_header = false;
|
||||
var $result = false;
|
||||
public $upgrader;
|
||||
public $done_header = false;
|
||||
public $result = false;
|
||||
|
||||
function __construct($args = array()) {
|
||||
public function __construct($args = array()) {
|
||||
$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
|
||||
$this->options = wp_parse_args($args, $defaults);
|
||||
}
|
||||
|
||||
function set_upgrader(&$upgrader) {
|
||||
public function set_upgrader(&$upgrader) {
|
||||
if ( is_object($upgrader) )
|
||||
$this->upgrader =& $upgrader;
|
||||
$this->add_strings();
|
||||
}
|
||||
|
||||
function add_strings() {
|
||||
public function add_strings() {
|
||||
}
|
||||
|
||||
function set_result($result) {
|
||||
public function set_result($result) {
|
||||
$this->result = $result;
|
||||
}
|
||||
|
||||
function request_filesystem_credentials($error = false) {
|
||||
public function request_filesystem_credentials($error = false) {
|
||||
$url = $this->options['url'];
|
||||
$context = $this->options['context'];
|
||||
if ( !empty($this->options['nonce']) )
|
||||
|
|
@ -46,18 +46,18 @@ class WP_Upgrader_Skin {
|
|||
return request_filesystem_credentials($url, '', $error, $context); //Possible to bring inline, Leaving as is for now.
|
||||
}
|
||||
|
||||
function header() {
|
||||
public function header() {
|
||||
if ( $this->done_header )
|
||||
return;
|
||||
$this->done_header = true;
|
||||
echo '<div class="wrap">';
|
||||
echo '<h2>' . $this->options['title'] . '</h2>';
|
||||
}
|
||||
function footer() {
|
||||
public function footer() {
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
function error($errors) {
|
||||
public function error($errors) {
|
||||
if ( ! $this->done_header )
|
||||
$this->header();
|
||||
if ( is_string($errors) ) {
|
||||
|
|
@ -72,7 +72,7 @@ class WP_Upgrader_Skin {
|
|||
}
|
||||
}
|
||||
|
||||
function feedback($string) {
|
||||
public function feedback($string) {
|
||||
if ( isset( $this->upgrader->strings[$string] ) )
|
||||
$string = $this->upgrader->strings[$string];
|
||||
|
||||
|
|
@ -89,8 +89,8 @@ class WP_Upgrader_Skin {
|
|||
return;
|
||||
show_message($string);
|
||||
}
|
||||
function before() {}
|
||||
function after() {}
|
||||
public function before() {}
|
||||
public function after() {}
|
||||
|
||||
/**
|
||||
* Output JavaScript that calls function to decrement the update counts.
|
||||
|
|
@ -122,11 +122,11 @@ class WP_Upgrader_Skin {
|
|||
* @since 2.8.0
|
||||
*/
|
||||
class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
|
||||
var $plugin = '';
|
||||
var $plugin_active = false;
|
||||
var $plugin_network_active = false;
|
||||
public $plugin = '';
|
||||
public $plugin_active = false;
|
||||
public $plugin_network_active = false;
|
||||
|
||||
function __construct($args = array()) {
|
||||
public function __construct($args = array()) {
|
||||
$defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
|
||||
$args = wp_parse_args($args, $defaults);
|
||||
|
||||
|
|
@ -138,7 +138,7 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
parent::__construct($args);
|
||||
}
|
||||
|
||||
function after() {
|
||||
public function after() {
|
||||
$this->plugin = $this->upgrader->plugin_info();
|
||||
if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
|
||||
echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) .'"></iframe>';
|
||||
|
|
@ -176,17 +176,17 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
* @since 3.0.0
|
||||
*/
|
||||
class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
|
||||
var $in_loop = false;
|
||||
var $error = false;
|
||||
public $in_loop = false;
|
||||
public $error = false;
|
||||
|
||||
function __construct($args = array()) {
|
||||
public function __construct($args = array()) {
|
||||
$defaults = array( 'url' => '', 'nonce' => '' );
|
||||
$args = wp_parse_args($args, $defaults);
|
||||
|
||||
parent::__construct($args);
|
||||
}
|
||||
|
||||
function add_strings() {
|
||||
public function add_strings() {
|
||||
$this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
|
||||
$this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: <strong>%2$s</strong>');
|
||||
$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
|
||||
|
|
@ -194,7 +194,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
|
||||
}
|
||||
|
||||
function feedback($string) {
|
||||
public function feedback($string) {
|
||||
if ( isset( $this->upgrader->strings[$string] ) )
|
||||
$string = $this->upgrader->strings[$string];
|
||||
|
||||
|
|
@ -215,14 +215,14 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
echo "<p>$string</p>\n";
|
||||
}
|
||||
|
||||
function header() {
|
||||
public function header() {
|
||||
// Nothing, This will be displayed within a iframe.
|
||||
}
|
||||
|
||||
function footer() {
|
||||
public function footer() {
|
||||
// Nothing, This will be displayed within a iframe.
|
||||
}
|
||||
function error($error) {
|
||||
public function error($error) {
|
||||
if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
|
||||
$this->error = $this->upgrader->strings[$error];
|
||||
|
||||
|
|
@ -238,15 +238,15 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
|
||||
}
|
||||
|
||||
function bulk_header() {
|
||||
public function bulk_header() {
|
||||
$this->feedback('skin_upgrade_start');
|
||||
}
|
||||
|
||||
function bulk_footer() {
|
||||
public function bulk_footer() {
|
||||
$this->feedback('skin_upgrade_end');
|
||||
}
|
||||
|
||||
function before($title = '') {
|
||||
public function before($title = '') {
|
||||
$this->in_loop = true;
|
||||
printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h4>', $title, $this->upgrader->update_current, $this->upgrader->update_count);
|
||||
echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').css("display", "inline-block");</script>';
|
||||
|
|
@ -254,7 +254,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
$this->flush_output();
|
||||
}
|
||||
|
||||
function after($title = '') {
|
||||
public function after($title = '') {
|
||||
echo '</p></div>';
|
||||
if ( $this->error || ! $this->result ) {
|
||||
if ( $this->error )
|
||||
|
|
@ -274,12 +274,12 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
$this->flush_output();
|
||||
}
|
||||
|
||||
function reset() {
|
||||
public function reset() {
|
||||
$this->in_loop = false;
|
||||
$this->error = false;
|
||||
}
|
||||
|
||||
function flush_output() {
|
||||
public function flush_output() {
|
||||
wp_ob_end_flush_all();
|
||||
flush();
|
||||
}
|
||||
|
|
@ -305,26 +305,26 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
}
|
||||
|
||||
class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
|
||||
var $plugin_info = array(); // Plugin_Upgrader::bulk() will fill this in.
|
||||
public $plugin_info = array(); // Plugin_Upgrader::bulk() will fill this in.
|
||||
|
||||
function __construct($args = array()) {
|
||||
public function __construct($args = array()) {
|
||||
parent::__construct($args);
|
||||
}
|
||||
|
||||
function add_strings() {
|
||||
public function add_strings() {
|
||||
parent::add_strings();
|
||||
$this->upgrader->strings['skin_before_update_header'] = __('Updating Plugin %1$s (%2$d/%3$d)');
|
||||
}
|
||||
|
||||
function before($title = '') {
|
||||
public function before($title = '') {
|
||||
parent::before($this->plugin_info['Title']);
|
||||
}
|
||||
|
||||
function after($title = '') {
|
||||
public function after($title = '') {
|
||||
parent::after($this->plugin_info['Title']);
|
||||
$this->decrement_update_count( 'plugin' );
|
||||
}
|
||||
function bulk_footer() {
|
||||
public function bulk_footer() {
|
||||
parent::bulk_footer();
|
||||
$update_actions = array(
|
||||
'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>',
|
||||
|
|
@ -349,27 +349,27 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
|
|||
}
|
||||
|
||||
class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
|
||||
var $theme_info = array(); // Theme_Upgrader::bulk() will fill this in.
|
||||
public $theme_info = array(); // Theme_Upgrader::bulk() will fill this in.
|
||||
|
||||
function __construct($args = array()) {
|
||||
public function __construct($args = array()) {
|
||||
parent::__construct($args);
|
||||
}
|
||||
|
||||
function add_strings() {
|
||||
public function add_strings() {
|
||||
parent::add_strings();
|
||||
$this->upgrader->strings['skin_before_update_header'] = __('Updating Theme %1$s (%2$d/%3$d)');
|
||||
}
|
||||
|
||||
function before($title = '') {
|
||||
public function before($title = '') {
|
||||
parent::before( $this->theme_info->display('Name') );
|
||||
}
|
||||
|
||||
function after($title = '') {
|
||||
public function after($title = '') {
|
||||
parent::after( $this->theme_info->display('Name') );
|
||||
$this->decrement_update_count( 'theme' );
|
||||
}
|
||||
|
||||
function bulk_footer() {
|
||||
public function bulk_footer() {
|
||||
parent::bulk_footer();
|
||||
$update_actions = array(
|
||||
'themes_page' => '<a href="' . self_admin_url('themes.php') . '" title="' . esc_attr__('Go to themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>',
|
||||
|
|
@ -401,10 +401,10 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
|
|||
* @since 2.8.0
|
||||
*/
|
||||
class Plugin_Installer_Skin extends WP_Upgrader_Skin {
|
||||
var $api;
|
||||
var $type;
|
||||
public $api;
|
||||
public $type;
|
||||
|
||||
function __construct($args = array()) {
|
||||
public function __construct($args = array()) {
|
||||
$defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
|
||||
$args = wp_parse_args($args, $defaults);
|
||||
|
||||
|
|
@ -414,12 +414,12 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
|
|||
parent::__construct($args);
|
||||
}
|
||||
|
||||
function before() {
|
||||
public function before() {
|
||||
if ( !empty($this->api) )
|
||||
$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
|
||||
}
|
||||
|
||||
function after() {
|
||||
public function after() {
|
||||
|
||||
$plugin_file = $this->upgrader->plugin_info();
|
||||
|
||||
|
|
@ -476,10 +476,10 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
|
|||
* @since 2.8.0
|
||||
*/
|
||||
class Theme_Installer_Skin extends WP_Upgrader_Skin {
|
||||
var $api;
|
||||
var $type;
|
||||
public $api;
|
||||
public $type;
|
||||
|
||||
function __construct($args = array()) {
|
||||
public function __construct($args = array()) {
|
||||
$defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
|
||||
$args = wp_parse_args($args, $defaults);
|
||||
|
||||
|
|
@ -489,12 +489,12 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
|
|||
parent::__construct($args);
|
||||
}
|
||||
|
||||
function before() {
|
||||
public function before() {
|
||||
if ( !empty($this->api) )
|
||||
$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
|
||||
}
|
||||
|
||||
function after() {
|
||||
public function after() {
|
||||
if ( empty($this->upgrader->result['destination_name']) )
|
||||
return;
|
||||
|
||||
|
|
@ -559,9 +559,9 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
|
|||
* @since 2.8.0
|
||||
*/
|
||||
class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
|
||||
var $theme = '';
|
||||
public $theme = '';
|
||||
|
||||
function __construct($args = array()) {
|
||||
public function __construct($args = array()) {
|
||||
$defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
|
||||
$args = wp_parse_args($args, $defaults);
|
||||
|
||||
|
|
@ -570,7 +570,7 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
parent::__construct($args);
|
||||
}
|
||||
|
||||
function after() {
|
||||
public function after() {
|
||||
$this->decrement_update_count( 'theme' );
|
||||
|
||||
$update_actions = array();
|
||||
|
|
@ -630,11 +630,11 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
* @since 3.7.0
|
||||
*/
|
||||
class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
|
||||
var $language_update = null;
|
||||
var $done_header = false;
|
||||
var $display_footer_actions = true;
|
||||
public $language_update = null;
|
||||
public $done_header = false;
|
||||
public $display_footer_actions = true;
|
||||
|
||||
function __construct( $args = array() ) {
|
||||
public function __construct( $args = array() ) {
|
||||
$defaults = array( 'url' => '', 'nonce' => '', 'title' => __( 'Update Translations' ), 'skip_header_footer' => false );
|
||||
$args = wp_parse_args( $args, $defaults );
|
||||
if ( $args['skip_header_footer'] ) {
|
||||
|
|
@ -644,7 +644,7 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
parent::__construct( $args );
|
||||
}
|
||||
|
||||
function before() {
|
||||
public function before() {
|
||||
$name = $this->upgrader->get_name_for_update( $this->language_update );
|
||||
|
||||
echo '<div class="update-messages lp-show-latest">';
|
||||
|
|
@ -652,17 +652,17 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
printf( '<h4>' . __( 'Updating translations for %1$s (%2$s)…' ) . '</h4>', $name, $this->language_update->language );
|
||||
}
|
||||
|
||||
function error( $error ) {
|
||||
public function error( $error ) {
|
||||
echo '<div class="lp-error">';
|
||||
parent::error( $error );
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
function after() {
|
||||
public function after() {
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
function bulk_footer() {
|
||||
public function bulk_footer() {
|
||||
$this->decrement_update_count( 'translation' );
|
||||
$update_actions = array();
|
||||
$update_actions['updates_page'] = '<a href="' . self_admin_url( 'update-core.php' ) . '" title="' . esc_attr__( 'Go to WordPress Updates page' ) . '" target="_parent">' . __( 'Return to WordPress Updates' ) . '</a>';
|
||||
|
|
@ -696,7 +696,7 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
|
||||
protected $messages = array();
|
||||
|
||||
function request_filesystem_credentials( $error = false, $context = '' ) {
|
||||
public function request_filesystem_credentials( $error = false, $context = '' ) {
|
||||
if ( $context )
|
||||
$this->options['context'] = $context;
|
||||
// TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version
|
||||
|
|
@ -707,11 +707,11 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
return $result;
|
||||
}
|
||||
|
||||
function get_upgrade_messages() {
|
||||
public function get_upgrade_messages() {
|
||||
return $this->messages;
|
||||
}
|
||||
|
||||
function feedback( $data ) {
|
||||
public function feedback( $data ) {
|
||||
if ( is_wp_error( $data ) )
|
||||
$string = $data->get_error_message();
|
||||
else if ( is_array( $data ) )
|
||||
|
|
@ -747,19 +747,19 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||
$this->messages[] = $string;
|
||||
}
|
||||
|
||||
function header() {
|
||||
public function header() {
|
||||
ob_start();
|
||||
}
|
||||
|
||||
function footer() {
|
||||
public function footer() {
|
||||
$output = ob_get_contents();
|
||||
if ( ! empty( $output ) )
|
||||
$this->feedback( $output );
|
||||
ob_end_clean();
|
||||
}
|
||||
|
||||
function bulk_header() {}
|
||||
function bulk_footer() {}
|
||||
function before() {}
|
||||
function after() {}
|
||||
public function bulk_header() {}
|
||||
public function bulk_footer() {}
|
||||
public function before() {}
|
||||
public function after() {}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue