From 3fc5956921519711eacbcb4688e5e9f0cb5987fd Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 31 May 2011 19:58:36 +0000 Subject: [PATCH] s/seperator/separator/. Props brandonburke. fixes #17610 git-svn-id: http://svn.automattic.com/wordpress/trunk@18084 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-upgrader.php | 2 +- wp-admin/includes/menu.php | 12 ++++++------ wp-admin/includes/plugin.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 767a6737df..4270d090da 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -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); diff --git a/wp-admin/includes/menu.php b/wp-admin/includes/menu.php index 158b94574d..40c4fb1cee 100644 --- a/wp-admin/includes/menu.php +++ b/wp-admin/includes/menu.php @@ -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); diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 1597b2230d..6b0edcc31c 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -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);