site_iri: comparison web/wp-admin/includes/plugin.php

equal deleted inserted replaced

-:a4642baaf829
+:4d4862461b8d
 * @param bool $markup If the returned data should have HTML markup applied
 * @param bool $translate If the returned data should be translated
 * @return array See above for description.
 */
 function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
-	// We don't need to write to the file, so just open for reading.
-	$fp = fopen($plugin_file, 'r');
+	$default_headers = array(
+		'Name' => 'Plugin Name',
-	// Pull only the first 8kiB of the file in.
+		'PluginURI' => 'Plugin URI',
-	$plugin_data = fread( $fp, 8192 );
+		'Version' => 'Version',
+		'Description' => 'Description',
-	// PHP will close file handle, but we are good citizens.
+		'Author' => 'Author',
-	fclose($fp);
+		'AuthorURI' => 'Author URI',
+		'TextDomain' => 'Text Domain',
-	preg_match( '|Plugin Name:(.*)$|mi', $plugin_data, $name );
+		'DomainPath' => 'Domain Path'
-	preg_match( '|Plugin URI:(.*)$|mi', $plugin_data, $uri );
+		);
-	preg_match( '|Version:(.*)|i', $plugin_data, $version );
-	preg_match( '|Description:(.*)$|mi', $plugin_data, $description );
+	$plugin_data = get_file_data( $plugin_file, $default_headers, 'plugin' );
-	preg_match( '|Author:(.*)$|mi', $plugin_data, $author_name );
-	preg_match( '|Author URI:(.*)$|mi', $plugin_data, $author_uri );
+	//For backward compatibility by default Title is the same as Name.
-	preg_match( '|Text Domain:(.*)$|mi', $plugin_data, $text_domain );
+	$plugin_data['Title'] = $plugin_data['Name'];
-	preg_match( '|Domain Path:(.*)$|mi', $plugin_data, $domain_path );
-	foreach ( array( 'name', 'uri', 'version', 'description', 'author_name', 'author_uri', 'text_domain', 'domain_path' ) as $field ) {
-		if ( !empty( ${$field} ) )
-			${$field} = _cleanup_header_comment(${$field}[1]);
-		else
-			${$field} = '';
-	}
-	$plugin_data = array(
-				'Name' => $name, 'Title' => $name, 'PluginURI' => $uri, 'Description' => $description,
-				'Author' => $author_name, 'AuthorURI' => $author_uri, 'Version' => $version,
-				'TextDomain' => $text_domain, 'DomainPath' => $domain_path
-				);
 	if ( $markup || $translate )
-		$plugin_data = _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup, $translate);
+		$plugin_data = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup, $translate );
 	return $plugin_data;
 }
 function _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup = true, $translate = true) {
 	//Translate fields
 	if( $translate && ! empty($plugin_data['TextDomain']) ) {
 		if( ! empty( $plugin_data['DomainPath'] ) )
-			load_plugin_textdomain($plugin_data['TextDomain'], dirname($plugin_file). $plugin_data['DomainPath']);
+			load_plugin_textdomain($plugin_data['TextDomain'], false, dirname($plugin_file). $plugin_data['DomainPath']);
 		else
-			load_plugin_textdomain($plugin_data['TextDomain'], dirname($plugin_file));
+			load_plugin_textdomain($plugin_data['TextDomain'], false, dirname($plugin_file));
 		foreach ( array('Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version') as $field )
 			$plugin_data[ $field ] = translate($plugin_data[ $field ], $plugin_data['TextDomain']);
 	}
 *
 * @param string $plugin Base plugin path from plugins directory.
 * @return bool True, if in the active plugins list. False, not in the list.
 */
 function is_plugin_active($plugin) {
-	return in_array($plugin, get_option('active_plugins'));
+	return in_array( $plugin, apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) );
 }
 /**
 * Attempts activation of plugin in a "sandbox" and redirects on success.
 *
 			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
 		ob_start();
 		@include(WP_PLUGIN_DIR . '/' . $plugin);
 		$current[] = $plugin;
 		sort($current);
+		do_action( 'activate_plugin', trim( $plugin) );
 		update_option('active_plugins', $current);
-		do_action('activate_' . $plugin);
+		do_action( 'activate_' . trim( $plugin ) );
+		do_action( 'activated_plugin', trim( $plugin) );
 		ob_end_clean();
 	}
 	return null;
 }
 	foreach ( $plugins as $plugin ) {
 		$plugin = plugin_basename($plugin);
 		if( ! is_plugin_active($plugin) )
 			continue;
-		array_splice($current, array_search( $plugin, $current), 1 ); // Fixed Array-fu!
+		if ( ! $silent )
-		if ( ! $silent ) //Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
+			do_action( 'deactivate_plugin', trim( $plugin ) );
-			do_action('deactivate_' . trim( $plugin ));
+		$key = array_search( $plugin, (array) $current );
+		if ( false !== $key )
+			array_splice( $current, $key, 1 );
+		//Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
+		if ( ! $silent ) {
+			do_action( 'deactivate_' . trim( $plugin ) );
+			do_action( 'deactivated_plugin', trim( $plugin ) );
+		}
 	}
 	update_option('active_plugins', $current);
 }
 	return true;
 }
 function validate_active_plugins() {
-	$check_plugins = get_option('active_plugins');
+	$check_plugins = apply_filters( 'active_plugins', get_option('active_plugins') );
 	// Sanity check.  If the active plugin list is not an array, make it an
 	// empty array.
 	if ( !is_array($check_plugins) ) {
 		update_option('active_plugins', array());
 //
 // Menu
 //
-function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '' ) {
+function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '', $position = NULL ) {
 	global $menu, $admin_page_hooks, $_registered_pages;
 	$file = plugin_basename( $file );
 	$admin_page_hooks[$file] = sanitize_title( $menu_title );
 	$hookname = get_plugin_page_hookname( $file, '' );
 	if (!empty ( $function ) && !empty ( $hookname ))
 		add_action( $hookname, $function );
-	if ( empty($icon_url) )
+	if ( empty($icon_url) ) {
 		$icon_url = 'images/generic.png';
-	elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
+	} elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') ) {
 		$icon_url = 'https://' . substr($icon_url, 7);
+	}
-	$menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+	$new_menu = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+	if ( NULL === $position  ) {
+		$menu[] = $new_menu;
+	} else {
+		$menu[$position] = $new_menu;
+	}
 	$_registered_pages[$hookname] = true;
 	return $hookname;
 }
 function add_object_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
-	global $menu, $admin_page_hooks, $_wp_last_object_menu, $_registered_pages;
+	global $_wp_last_object_menu;
-	$file = plugin_basename( $file );
-	$admin_page_hooks[$file] = sanitize_title( $menu_title );
-	$hookname = get_plugin_page_hookname( $file, '' );
-	if (!empty ( $function ) && !empty ( $hookname ))
-		add_action( $hookname, $function );
-	if ( empty($icon_url) )
-		$icon_url = 'images/generic.png';
 	$_wp_last_object_menu++;
-	$menu[$_wp_last_object_menu] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+	return add_menu_page($page_title, $menu_title, $access_level, $file, $function, $icon_url, $_wp_last_object_menu);
-	$_registered_pages[$hookname] = true;
-	return $hookname;
 }
 function add_utility_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
-	global $menu, $admin_page_hooks, $_wp_last_utility_menu, $_registered_pages;
+	global $_wp_last_utility_menu;
-	$file = plugin_basename( $file );
-	$admin_page_hooks[$file] = sanitize_title( $menu_title );
-	$hookname = get_plugin_page_hookname( $file, '' );
-	if (!empty ( $function ) && !empty ( $hookname ))
-		add_action( $hookname, $function );
-	if ( empty($icon_url) )
-		$icon_url = 'images/generic.png';
-	elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
-		$icon_url = 'https://' . substr($icon_url, 7);
 	$_wp_last_utility_menu++;
-	$menu[$_wp_last_utility_menu] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+	return add_menu_page($page_title, $menu_title, $access_level, $file, $function, $icon_url, $_wp_last_utility_menu);
-	$_registered_pages[$hookname] = true;
-	return $hookname;
 }
 function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $file, $function = '' ) {
 	global $submenu;
 	global $menu;
 	if (!empty ( $function ) && !empty ( $hookname ))
 		add_action( $hookname, $function );
 	$_registered_pages[$hookname] = true;
 	// backwards-compatibility for plugins using add_management page.  See wp-admin/admin.php for redirect from edit.php to tools.php
 	if ( 'tools.php' == $parent )
 		$_registered_pages[get_plugin_page_hookname( $file, 'edit.php')] = true;
 	return $hookname;
 }
 /**
 * Register a setting and its sanitization callback
 *
 * @since 2.7.0
 *
-* @param string $option_group A settings group name.  Can be anything.
+* @param string $option_group A settings group name.  Should correspond to a whitelisted option key name.
+* 	Default whitelisted option key names include "general," "discussion," and "reading," among others.
 * @param string $option_name The name of an option to sanitize and save.
 * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value.
 * @return unknown
 */
 function register_setting($option_group, $option_name, $sanitize_callback = '') {

branch	wordpress
changeset 132	4d4862461b8d
parent 109	03b0d1493584