Changes in trunk/wp-admin/includes/plugin.php [17310:18136]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/plugin.php
r17310 r18136 244 244 $plugin_files[] = "$file/$subfile"; 245 245 } 246 closedir( $plugins_subdir ); 246 247 } 247 248 } else { … … 250 251 } 251 252 } 252 } else { 253 return $wp_plugins; 254 } 255 256 @closedir( $plugins_dir ); 257 @closedir( $plugins_subdir ); 253 closedir( $plugins_dir ); 254 } 258 255 259 256 if ( empty($plugin_files) ) … … 706 703 $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) ); 707 704 // If plugin is in its own directory, recursively delete the directory. 708 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 709 706 $deleted = $wp_filesystem->delete($this_plugin_dir, true); 710 707 else … … 967 964 * @param callback $function The function to be called to output the content for this page. 968 965 * 969 * @return string The resulting page's hook_suffix966 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 970 967 */ 971 968 function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1031 1028 * @param callback $function The function to be called to output the content for this page. 1032 1029 * 1033 * @return string The resulting page's hook_suffix1030 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1034 1031 */ 1035 1032 function add_management_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1052 1049 * @param callback $function The function to be called to output the content for this page. 1053 1050 * 1054 * @return string The resulting page's hook_suffix1051 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1055 1052 */ 1056 1053 function add_options_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1073 1070 * @param callback $function The function to be called to output the content for this page. 1074 1071 * 1075 * @return string The resulting page's hook_suffix1072 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1076 1073 */ 1077 1074 function add_theme_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1094 1091 * @param callback $function The function to be called to output the content for this page. 1095 1092 * 1096 * @return string The resulting page's hook_suffix1093 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1097 1094 */ 1098 1095 function add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1115 1112 * @param callback $function The function to be called to output the content for this page. 1116 1113 * 1117 * @return string The resulting page's hook_suffix1114 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1118 1115 */ 1119 1116 function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1139 1136 * @param callback $function The function to be called to output the content for this page. 1140 1137 * 1141 * @return string The resulting page's hook_suffix1138 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1142 1139 */ 1143 1140 function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1160 1157 * @param callback $function The function to be called to output the content for this page. 1161 1158 * 1162 * @return string The resulting page's hook_suffix1159 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1163 1160 */ 1164 1161 function add_posts_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1181 1178 * @param callback $function The function to be called to output the content for this page. 1182 1179 * 1183 * @return string The resulting page's hook_suffix1180 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1184 1181 */ 1185 1182 function add_media_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1202 1199 * @param callback $function The function to be called to output the content for this page. 1203 1200 * 1204 * @return string The resulting page's hook_suffix1201 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1205 1202 */ 1206 1203 function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1223 1220 * @param callback $function The function to be called to output the content for this page. 1224 1221 * 1225 * @return string The resulting page's hook_suffix1222 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1226 1223 */ 1227 1224 function add_pages_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { … … 1244 1241 * @param callback $function The function to be called to output the content for this page. 1245 1242 * 1246 * @return string The resulting page's hook_suffix1243 * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. 1247 1244 */ 1248 1245 function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
Note: See TracChangeset
for help on using the changeset viewer.