sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s/seperator/separator/. Props brandonburke. fixes #17610 

git-svn-id: https://develop.svn.wordpress.org/trunk@18084 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2011-05-31 19:58:36 +00:00
parent 13a399b112
commit 89561d578e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -580,7 +580,7 @@ class Plugin_Upgrader extends WP_Upgrader {
return $removed;
// If plugin is in its own directory, recursively delete the directory.
if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that its not the root plugin folder
$deleted = $wp_filesystem->delete($this_plugin_dir, true);
else
$deleted = $wp_filesystem->delete($plugins_dir . $plugin);

12
wp-admin/includes/menu.php
View File

@ -121,18 +121,18 @@ foreach ( $menu as $id => $data ) {
}
unset($id, $data, $subs, $first_sub);
// Remove any duplicated seperators
$seperator_found = false;
// Remove any duplicated separators
$separator_found = false;
foreach ( $menu as $id => $data ) {
if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) {
if (false == $seperator_found) {
$seperator_found = true;
if (false == $separator_found) {
$separator_found = true;
} else {
unset($menu[$id]);
$seperator_found = false;
$separator_found = false;
}
} else {
$seperator_found = false;
$separator_found = false;
}
}
unset($id, $data);

2
wp-admin/includes/plugin.php
View File

@ -702,7 +702,7 @@ function delete_plugins($plugins, $redirect = '' ) {
$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) );
// If plugin is in its own directory, recursively delete the directory.
if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that its not the root plugin folder
$deleted = $wp_filesystem->delete($this_plugin_dir, true);
else
$deleted = $wp_filesystem->delete($plugins_dir . $plugin_file);