<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[32643] trunk/src/wp-admin: Add `@global` annotations to (the rest of the?) `wp-admin/*` files.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32643">32643</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32643","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-29 02:05:26 +0000 (Fri, 29 May 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Add `@global` annotations to (the rest of the?) `wp-admin/*` files.
Does not include list table file changes.
See <a href="https://core.trac.wordpress.org/ticket/32444">#32444</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesscreenphp">trunk/src/wp-admin/includes/screen.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemeinstallphp">trunk/src/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludestranslationinstallphp">trunk/src/wp-admin/includes/translation-install.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/plugin.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1004,6 +1004,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx" style="display: block; padding: 0 10px"> * that the user has the required capability as well.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $menu
+ * @global array $admin_page_hooks
+ * @global array $_registered_pages
+ * @global array $_parent_pages
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1062,6 +1067,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx" style="display: block; padding: 0 10px"> * that the user has the required capability as well.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global int $_wp_last_object_menu
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1088,6 +1095,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx" style="display: block; padding: 0 10px"> * that the user has the required capability as well.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global int $_wp_last_utility_menu
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1114,6 +1123,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx" style="display: block; padding: 0 10px"> * that the user has the required capability as well.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $submenu
+ * @global array $menu
+ * @global type $_wp_real_parent_file
+ * @global bool $_wp_submenu_nopriv
+ * @global array $_registered_pages
+ * @global array $_parent_pages
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $parent_slug The slug name for the parent menu (or the file name of a standard WordPress admin page)
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1124,12 +1140,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $submenu;
- global $menu;
- global $_wp_real_parent_file;
- global $_wp_submenu_nopriv;
- global $_registered_pages;
- global $_parent_pages;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $submenu, $menu, $_wp_real_parent_file, $_wp_submenu_nopriv,
+ $_registered_pages, $_parent_pages;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_slug = plugin_basename( $menu_slug );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_slug = plugin_basename( $parent_slug);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1415,6 +1427,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $menu
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug of the menu
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|bool The removed menu on success, False if not found
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1436,6 +1450,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $submenu
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug for the parent menu
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $submenu_slug The slug of the submenu
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|bool The removed submenu on success, False if not found
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1463,6 +1479,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $_parent_pages
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu)
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $echo Whether or not to echo the url - default is true
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string the url
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1492,17 +1510,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span><span class="cx" style="display: block; padding: 0 10px"> // Pluggable Menu Support -- Private
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @global string $parent_file
+ * @global array $menu
+ * @global array $submenu
+ * @global string $pagenow
+ * @global string $typenow
+ * @global string $plugin_page
+ * @global string $_wp_real_parent_file
+ * @global array $_wp_menu_nopriv
+ * @global array $_wp_submenu_nopriv
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_admin_page_parent( $parent = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $parent_file;
- global $menu;
- global $submenu;
- global $pagenow;
- global $typenow;
- global $plugin_page;
- global $_wp_real_parent_file;
- global $_wp_menu_nopriv;
- global $_wp_submenu_nopriv;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $parent_file, $menu, $submenu, $pagenow, $typenow,
+ $plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty ( $parent ) && 'admin.php' != $parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_wp_real_parent_file[$parent] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1556,13 +1578,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @global string $title
+ * @global array $menu
+ * @global array $submenu
+ * @global string $pagenow
+ * @global string $plugin_page
+ * @global string $typenow
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_admin_page_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $title;
- global $menu;
- global $submenu;
- global $pagenow;
- global $plugin_page;
- global $typenow;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty ( $title ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $title;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1640,6 +1666,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @global array $admin_page_hooks
+ * @param string $plugin_page
+ * @param string $parent_page
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_plugin_page_hookname( $plugin_page, $parent_page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $admin_page_hooks;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1661,14 +1693,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $page_type . '_page_' . $plugin_name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @global string $pagenow
+ * @global array $menu
+ * @global array $submenu
+ * @global array $_wp_menu_nopriv
+ * @global array $_wp_submenu_nopriv
+ * @global string $plugin_page
+ * @global array $_registered_pages
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function user_can_access_admin_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $pagenow;
- global $menu;
- global $submenu;
- global $_wp_menu_nopriv;
- global $_wp_submenu_nopriv;
- global $plugin_page;
- global $_registered_pages;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $pagenow, $menu, $submenu, $_wp_menu_nopriv, $_wp_submenu_nopriv,
+ $plugin_page, $_registered_pages;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = get_admin_page_parent();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1741,6 +1778,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $new_whitelist_options
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default whitelisted option key names include "general," "discussion," and "reading," among others.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option_name The name of an option to sanitize and save.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1769,6 +1808,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $new_whitelist_options
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $option_group
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option_name
</span><span class="cx" style="display: block; padding: 0 10px"> * @param callable $sanitize_callback
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1798,6 +1839,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $new_whitelist_options
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $options
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1816,6 +1859,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $whitelist_options
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $new_options
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $options
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1847,6 +1892,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $whitelist_options
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $del_options
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $options
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/post.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,6 +173,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $post_data Optional.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,6 +403,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $post_data Optional, the array of post data to process if not provided will use $_POST superglobal.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,6 +658,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $title Post title
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content Optional post content
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $date Optional post date
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,6 +701,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_User $current_user
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_write_post() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,6 +842,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return mixed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_meta_keys() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -865,6 +875,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $postid
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1055,6 +1067,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $type
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1338,6 +1352,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global int $content_width
+ * @global array $_wp_additional_image_sizes
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $thumbnail_id ID of the attachment used for thumbnail
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string html
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/schema.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,14 +8,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Administration
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Declare these as global in case schema.php is included from a function.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Declare these as global in case schema.php is included from a function.
+ *
+ * @global wpdb $wpdb
+ * @global array $wp_queries
+ * @global string $charset_collate
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $wp_queries, $charset_collate;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The database character collate.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var string
- * @global string
- * @name $charset_collate
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $charset_collate = $wpdb->get_charset_collate();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,6 +27,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The SQL needed to create the requested tables.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -863,6 +868,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ * @global object $current_site
+ * @global int $wp_db_version
+ * @global WP_Rewrite $wp_rewrite
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $network_id ID of network to populate.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful,
</span><span class="cx" style="display: block; padding: 0 10px"> * so the error code must be checked) or failure.
</span></span></pre></div>
<a id="trunksrcwpadminincludesscreenphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/screen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/screen.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/screen.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +60,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_meta_boxes
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Screen $screen
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function meta_box_prefs( $screen ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,6 +164,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_Screen $current_screen
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Screen Current screen object
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_current_screen() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,6 +372,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $hook_suffix
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|WP_Screen $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen.
</span><span class="cx" style="display: block; padding: 0 10px"> * Defaults to the current $hook_suffix global.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Screen Screen object.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,6 +535,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see set_current_screen()
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Screen $current_screen
+ * @global string $taxnow
+ * @global string $typenow
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_current_screen() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $current_screen, $taxnow, $typenow;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,6 +797,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This will trigger the deprecated filters for backwards compatibility.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global string $screen_layout_columns
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_screen_meta() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -959,6 +971,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @global array $wp_meta_boxes
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function show_screen_options() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_meta_boxes;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1017,6 +1035,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Render the screen options tab.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global array $wp_meta_boxes
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_screen_options() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_meta_boxes;
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/template.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,6 +436,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_List_Table $wp_list_table
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $checkbox
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $mode
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -656,6 +658,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post Optional. The post being edited.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function meta_form( $post = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,6 +741,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_Locale $wp_locale
+ * @global object $comment
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int|bool $edit Accepts 1|true for editing the date, 0|false for adding the date.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|bool $for_post Accepts 1|true for applying the date to a post, 0|false for a comment.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $tab_index The tabindex attribute to add. Default 0.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,6 +846,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $default Optional. The default page ID to be pre-selected. Default 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $parent Optional. The parent page ID. Default 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $level Optional. Page depth level. Default 0.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -934,6 +943,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_meta_boxes
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $id String for use in the 'id' attribute of tags.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title Title of the meta box.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param callback $callback Function that fills the box with the desired content.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1022,6 +1033,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_meta_boxes
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @staticvar bool $already_sorted
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|WP_Screen $screen Screen identifier
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context box context
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1090,6 +1103,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_meta_boxes
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $id String for use in the 'id' attribute of tags.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|object $screen The screen on which to show the box (post, page, link).
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context The context within the page where the boxes should show ('normal', 'advanced').
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1576,6 +1591,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $hook_suffix
+ * @global string $admin_body_class
+ * @global WP_Locale $wp_locale
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $title Optional. Title of the Iframe page. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $deprecated Not used.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1637,7 +1656,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/admin-header.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_body_classes = apply_filters( 'admin_body_class', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<body<?php
+/**
+ * @global string $body_id
+ */
+if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> (function(){
</span><span class="cx" style="display: block; padding: 0 10px"> var c = document.body.className;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1921,6 +1944,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $button;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @global bool $is_IE
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function _wp_admin_html_begin() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $is_IE;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2107,6 +2134,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @static
+ *
+ * @global bool $_wp_editor_expand
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function pointer_wp410_dfw() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't show when editor-scrolling is not used.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $GLOBALS['_wp_editor_expand'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme-install.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/theme-install.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,6 +150,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Prints a theme on the Install Themes pages.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Theme_Install_List_Table $wp_list_table
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function display_theme( $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.4' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,6 +167,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Display theme content based on theme list.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Theme_Install_List_Table $wp_list_table
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function display_themes() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_list_table;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,6 +189,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Display theme information in dialog box form.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Theme_Install_List_Table $wp_list_table
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function install_theme_information() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_list_table;
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/theme.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_Filesystem_Base $wp_filesystem Subclass
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $stylesheet Stylesheet of the theme to delete
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $redirect Redirect to page when complete.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed
</span></span></pre></div>
<a id="trunksrcwpadminincludestranslationinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/translation-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/translation-install.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/translation-install.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,6 +124,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $wp_local_package
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $languages Array of available languages (populated via the Translation API).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_install_language_form( $languages ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/update-core.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,6 +768,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_Filesystem_Base $wp_filesystem
+ * @global array $_old_files
+ * @global array $_new_bundled_files
+ * @global wpdb $wpdb
+ * @global string $wp_version
+ * @global string $required_php_version
+ * @global string $required_mysql_version
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $from New release unzipped path.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $to Path to old WordPress installation.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Error|null WP_Error on failure, null on success.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -810,8 +818,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'insane_distro', __('The update could not be unpacked') );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Import $wp_version, $required_php_version, and $required_mysql_version from the new version
- // $wp_filesystem->wp_content_dir() returned unslashed pre-2.8
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Import $wp_version, $required_php_version, and $required_mysql_version from the new version
+ * $wp_filesystem->wp_content_dir() returned unslashed pre-2.8
+ *
+ * @global string $wp_version
+ * @global string $required_php_version
+ * @global string $required_mysql_version
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_version, $required_php_version, $required_mysql_version;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1101,6 +1116,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0 Updated not to use a regular expression for the skip list
</span><span class="cx" style="display: block; padding: 0 10px"> * @see copy_dir()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_Filesystem_Base $wp_filesystem
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $from source directory
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $to destination directory
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $skip_list a list of files/folders to skip copying
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1156,6 +1173,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $wp_version
+ * @global string $pagenow
+ * @global string $action
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _redirect_to_about_wordpress( $new_version ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_version, $pagenow, $action;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1196,6 +1216,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Cleans up Genericons example files.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.2
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global array $wp_theme_directories
+ * @global WP_Filesystem_Base $wp_filesystem
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _upgrade_422_remove_genericons() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_theme_directories, $wp_filesystem;
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/update.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,6 +190,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'update_footer', 'core_update_footer' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @global string $pagenow
+ * @return false|void
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function update_nag() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && !current_user_can('update_core') )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,6 +405,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div></td></tr>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @global int $upgrading
+ * @return false|void
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function maintenance_nag() {
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
</span><span class="cx" style="display: block; padding: 0 10px"> global $upgrading;
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/includes/upgrade.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,6 +118,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ * @global WP_Rewrite $wp_rewrite
+ * @global string $table_prefix
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id User ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_install_defaults( $user_id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,6 +389,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global int $wp_current_db_version
+ * @global int $wp_db_version
+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return null If no update is necessary or site isn't completely installed, null.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_upgrade() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,6 +443,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.1
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global int $wp_current_db_version
+ * @global int $wp_db_version
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return null If no update is necessary, null.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_all() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,6 +556,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 1.0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_100() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -601,6 +614,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 1.0.1.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.1
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_101() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -619,6 +634,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 1.2.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_110() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,6 +696,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 1.5.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_130() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -763,6 +782,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 2.0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_160() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,6 +868,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 2.1.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_210() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,6 +915,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 2.3.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_230() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1066,6 +1094,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Remove old options from the database.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_230_options_table() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1080,6 +1110,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Remove old categories, link2cat, and post2cat database tables.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_230_old_tables() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1092,6 +1124,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Upgrade old slugs made in version 2.2.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_old_slugs() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Upgrade people who were using the Redirect Old Slugs plugin.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1103,6 +1137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 2.5.0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_250() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1117,6 +1153,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 2.5.2.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.2
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_252() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1128,6 +1166,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 2.6.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_260() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1140,6 +1180,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 2.7.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_270() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1156,6 +1199,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 2.8.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_280() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1183,6 +1229,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 2.9.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_290() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1200,6 +1248,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 3.0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_300() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1242,6 +1293,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 3.3.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
+ * @global array $wp_registered_widgets
+ * @global array $sidebars_widgets
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_330() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb, $wp_registered_widgets, $sidebars_widgets;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1311,6 +1367,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 3.4.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_340() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1344,6 +1403,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 3.5.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_350() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1371,6 +1433,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 3.7.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_370() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1383,6 +1447,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.2
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_372() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1394,6 +1460,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 3.8.0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_380() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1406,6 +1474,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 4.0.0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_400() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1424,6 +1494,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 4.2.0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_420() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1445,6 +1518,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute changes made in WordPress 4.3.0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_430() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1493,6 +1569,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Executes network-level upgrade routines.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_network() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1634,6 +1713,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $table_name Database table name to create.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $create_ddl SQL statement to create table.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool If table already exists or was created by function.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1662,6 +1743,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.1
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $table Database table name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $index Index name to drop.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, when finished.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1683,6 +1766,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.1
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $table Database table name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $index Database table index column.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, when done with execution.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1699,6 +1784,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $table_name The table name to modify.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $column_name The column name to add to the table.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $create_ddl The SQL statement used to add the column.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1729,6 +1816,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $table The table to convert.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool true if the table was converted, false if it wasn't.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1770,6 +1859,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return stdClass List of options.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_alloptions_110() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1792,6 +1883,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $setting Option name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1851,6 +1944,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $queries Optional. The query to run. Can be multiple queries
</span><span class="cx" style="display: block; padding: 0 10px"> * in an array, or a string of queries separated by
</span><span class="cx" style="display: block; padding: 0 10px"> * semicolons. Default empty.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2375,6 +2470,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks the version of the installed MySQL binary.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_check_mysql_version() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2404,6 +2501,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Disables the Link Manager on upgrade if, at the time of upgrade, no links exist in the DB.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function maybe_disable_link_manager() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2416,6 +2516,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Runs before the schema is upgraded.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global int $wp_current_db_version
+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function pre_schema_upgrade() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2472,6 +2575,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ * @global string $charset_collate
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !function_exists( 'install_global_terms' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> function install_global_terms() {
</span></span></pre></div>
<a id="trunksrcwpadminmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu.php 2015-05-28 21:40:27 UTC (rev 32642)
+++ trunk/src/wp-admin/menu.php 2015-05-29 02:05:26 UTC (rev 32643)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,8 +18,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 5: Icon for top level menu
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $menu
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @name $menu
- * @var array
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
</span></span></pre>
</div>
</div>
</body>
</html>