golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Test writability of ABSPATH when upgrading core or WP_PLUGIN_DIR when installing/updating themes and plugins, fixes #9936 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-05-31 21:08:03 +00:00
parent b7bc0faa73
commit e53c5c50f7
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/class-wp-upgrader.php
View File

@ -720,7 +720,7 @@ class WP_Upgrader_Skin {
return $this->__construct($args); return $this->__construct($args);
} }
function __construct($args = array()) { function __construct($args = array()) {
$defaults = array( 'url' => '', 'nonce' => '', 'title' => '' ); $defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
$this->options = wp_parse_args($args, $defaults); $this->options = wp_parse_args($args, $defaults);
} }
@ -734,9 +734,10 @@ class WP_Upgrader_Skin {
function request_filesystem_credentials($error = false) { function request_filesystem_credentials($error = false) {
$url = $this->options['url']; $url = $this->options['url'];
$context = $this->options['context'];
if ( !empty($this->options['nonce']) ) if ( !empty($this->options['nonce']) )
$url = wp_nonce_url($url, $this->options['nonce']); $url = wp_nonce_url($url, $this->options['nonce']);
return request_filesystem_credentials($url, '', $error); //Possible to bring inline, Leaving as0is for now. return request_filesystem_credentials($url, '', $error, $context); //Possible to bring inline, Leaving as is for now.
} }
function header() { function header() {

18
wp-admin/includes/file.php
View File

@ -583,12 +583,12 @@ function copy_dir($from, $to) {
* @param unknown_type $args * @param unknown_type $args
* @return unknown * @return unknown
*/ */
function WP_Filesystem( $args = false ) { function WP_Filesystem( $args = false, $context = false ) {
global $wp_filesystem; global $wp_filesystem;
require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php'); require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
$method = get_filesystem_method($args); $method = get_filesystem_method($args, $context);
if ( ! $method ) if ( ! $method )
return false; return false;
@ -625,13 +625,17 @@ function WP_Filesystem( $args = false ) {
* @since unknown * @since unknown
* *
* @param unknown_type $args * @param unknown_type $args
* @param string $context Full path to the directory that is tested for being writable.
* @return unknown * @return unknown
*/ */
function get_filesystem_method($args = array()) { function get_filesystem_method($args = array(), $context = false) {
$method = defined('FS_METHOD') ? FS_METHOD : false; //Please ensure that this is either 'direct', 'ssh', 'ftpext' or 'ftpsockets' $method = defined('FS_METHOD') ? FS_METHOD : false; //Please ensure that this is either 'direct', 'ssh', 'ftpext' or 'ftpsockets'
if( ! $method && function_exists('getmyuid') && function_exists('fileowner') ){ if( ! $method && function_exists('getmyuid') && function_exists('fileowner') ){
$temp_file_name = ABSPATH . '.' . time(); if ( !$context )
$context = WP_CONTENT_DIR;
$context = trailingslashit($context);
$temp_file_name = $context . '.write-test-' . time();
$temp_handle = @fopen($temp_file_name, 'w'); $temp_handle = @fopen($temp_file_name, 'w');
if ( $temp_handle ) { if ( $temp_handle ) {
if ( getmyuid() == fileowner($temp_file_name) ) if ( getmyuid() == fileowner($temp_file_name) )
@ -657,13 +661,13 @@ function get_filesystem_method($args = array()) {
* @param unknown_type $error * @param unknown_type $error
* @return unknown * @return unknown
*/ */
function request_filesystem_credentials($form_post, $type = '', $error = false) { function request_filesystem_credentials($form_post, $type = '', $error = false, $context = false) {
$req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error); $req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error, $context);
if ( '' !== $req_cred ) if ( '' !== $req_cred )
return $req_cred; return $req_cred;
if ( empty($type) ) if ( empty($type) )
$type = get_filesystem_method(); $type = get_filesystem_method(array(), $context);
if ( 'direct' == $type ) if ( 'direct' == $type )
return true; return true;

6
wp-admin/update-core.php
View File

@ -142,7 +142,7 @@ function do_core_upgrade( $reinstall = false ) {
else else
$url = 'update-core.php?action=do-core-upgrade'; $url = 'update-core.php?action=do-core-upgrade';
$url = wp_nonce_url($url, 'upgrade-core'); $url = wp_nonce_url($url, 'upgrade-core');
if ( false === ($credentials = request_filesystem_credentials($url)) ) if ( false === ($credentials = request_filesystem_credentials($url, '', false, ABSPATH)) )
return; return;
$version = isset( $_POST['version'] )? $_POST['version'] : false; $version = isset( $_POST['version'] )? $_POST['version'] : false;
@ -152,8 +152,8 @@ function do_core_upgrade( $reinstall = false ) {
return; return;
if ( ! WP_Filesystem($credentials) ) { if ( ! WP_Filesystem($credentials, ABSPATH) ) {
request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again request_filesystem_credentials($url, '', true, ABSPATH); //Failed to connect, Error and request again
return; return;
} }
?> ?>