public $done_header = false;
public $done_footer = false;
public $result = false;
+ public $options = array();
public function __construct($args = array()) {
$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
$this->options = wp_parse_args($args, $defaults);
}
+ /**
+ * @param WP_Upgrader $upgrader
+ */
public function set_upgrader(&$upgrader) {
if ( is_object($upgrader) )
$this->upgrader =& $upgrader;
$this->result = $result;
}
- public function request_filesystem_credentials($error = false) {
+ public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) {
$url = $this->options['url'];
- $context = $this->options['context'];
- if ( !empty($this->options['nonce']) )
+ if ( ! $context ) {
+ $context = $this->options['context'];
+ }
+ if ( !empty($this->options['nonce']) ) {
$url = wp_nonce_url($url, $this->options['nonce']);
- return request_filesystem_credentials($url, '', $error, $context); //Possible to bring inline, Leaving as is for now.
+ }
+
+ $extra_fields = array();
+
+ return request_filesystem_credentials( $url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership );
}
public function header() {
$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
}
+ /**
+ * @param string $string
+ */
public function feedback($string) {
if ( isset( $this->upgrader->strings[$string] ) )
$string = $this->upgrader->strings[$string];
class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
protected $messages = array();
- public function request_filesystem_credentials( $error = false, $context = '' ) {
- if ( $context )
+ public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
+ if ( $context ) {
$this->options['context'] = $context;
+ }
// TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version
// This will output a credentials form in event of failure, We don't want that, so just hide with a buffer
ob_start();
- $result = parent::request_filesystem_credentials( $error );
+ $result = parent::request_filesystem_credentials( $error, $context, $allow_relaxed_file_ownership );
ob_end_clean();
return $result;
}
return $this->messages;
}
+ /**
+ * @param string|array|WP_Error $data
+ */
public function feedback( $data ) {
if ( is_wp_error( $data ) )
$string = $data->get_error_message();