Changeset 18084
- Timestamp:
- 05/31/2011 07:58:36 PM (14 years ago)
- Location:
- trunk/wp-admin/includes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/class-wp-upgrader.php
r17771 r18084 581 581 582 582 // If plugin is in its own directory, recursively delete the directory. 583 if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory sep erator AND that its not the root plugin folder583 if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that its not the root plugin folder 584 584 $deleted = $wp_filesystem->delete($this_plugin_dir, true); 585 585 else -
trunk/wp-admin/includes/menu.php
r18038 r18084 122 122 unset($id, $data, $subs, $first_sub); 123 123 124 // Remove any duplicated sep erators125 $sep erator_found = false;124 // Remove any duplicated separators 125 $separator_found = false; 126 126 foreach ( $menu as $id => $data ) { 127 127 if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) { 128 if (false == $sep erator_found) {129 $sep erator_found = true;128 if (false == $separator_found) { 129 $separator_found = true; 130 130 } else { 131 131 unset($menu[$id]); 132 $sep erator_found = false;132 $separator_found = false; 133 133 } 134 134 } else { 135 $sep erator_found = false;135 $separator_found = false; 136 136 } 137 137 } -
trunk/wp-admin/includes/plugin.php
r17617 r18084 703 703 $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) ); 704 704 // If plugin is in its own directory, recursively delete the directory. 705 if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory sep erator AND that its not the root plugin folder705 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 706 706 $deleted = $wp_filesystem->delete($this_plugin_dir, true); 707 707 else
Note: See TracChangeset
for help on using the changeset viewer.