mirror
/
plugin-update-checker
mirror of https://github.com/YahnisElsts/plugin-update-checker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor: Move condition so that the fixDirectoryName filter never gets called if there's no valid directory name.

This commit is contained in:
Yahnis Elsts 2017-01-10 17:05:07 +02:00
parent d71578067d
commit 6ba1aeb362
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Puc/v4/UpdateChecker.php
View File

@ -105,7 +105,9 @@ if ( !class_exists('Puc_v4_UpdateChecker', false) ):
);
//Rename the update directory to be the same as the existing directory.
add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
if ( $this->directoryName !== '.' ) {
add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
}
//Allow HTTP requests to the metadata URL even if it's on a local host.
add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
@ -659,16 +661,13 @@ if ( !class_exists('Puc_v4_UpdateChecker', false) ):
}
//Rename the source to match the existing directory.
if ( $this->directoryName === '.' ) {
return $source;
}
$correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
if ( $source !== $correctedSource ) {
//The update archive should contain a single directory that contains the rest of plugin/theme files.
//Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
//We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
//after update.
if ($this->isBadDirectoryStructure($remoteSource)) {
if ( $this->isBadDirectoryStructure($remoteSource) ) {
return new WP_Error(
'puc-incorrect-directory-structure',
sprintf(
@ -686,7 +685,7 @@ if ( !class_exists('Puc_v4_UpdateChecker', false) ):
'<span class="code">' . $this->directoryName . '</span>'
));
if ($wp_filesystem->move($source, $correctedSource, true)) {
if ( $wp_filesystem->move($source, $correctedSource, true) ) {
$upgrader->skin->feedback('Directory successfully renamed.');
return $correctedSource;
} else {