<!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>[32654] trunk/src/wp-admin: Add missing doc blocks to `wp-admin/includes/*`.</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/32654">32654</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/32654","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 20:16:22 +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 missing doc blocks to `wp-admin/includes/*`.
Fix some egregious uses of tabbing.
Some functions can simply return `apply_filters(...)` instead of setting a variable that is immediately returned.
See <a href="https://core.trac.wordpress.org/ticket/32444">#32444</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincreditsphp">trunk/src/wp-admin/credits.php</a></li>
<li><a href="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
<li><a href="#trunksrcwpadmincustomheaderphp">trunk/src/wp-admin/custom-header.php</a></li>
<li><a href="#trunksrcwpadminincludesbookmarkphp">trunk/src/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystembasephp">trunk/src/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpextphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpsocketsphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemssh2php">trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpimporterphp">trunk/src/wp-admin/includes/class-wp-importer.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplinkslisttablephp">trunk/src/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludescommentphp">trunk/src/wp-admin/includes/comment.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="#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="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunksrcwpadmininstallhelperphp">trunk/src/wp-admin/install-helper.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminloadstylesphp">trunk/src/wp-admin/load-styles.php</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpadminnetworkphp">trunk/src/wp-admin/network.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincreditsphp"></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/credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/credits.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/credits.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|bool A list of all of the contributors, or false on error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|false A list of all of the contributors, or false on error.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_credits() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string &$display_name The contributor's display name, passed by reference.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $username The contributor's username.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $profiles URL to the contributor's WordPress.org profile page.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string A contributor's display name, hyperlinked to a WordPress.org profile page.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +67,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string &$data External library data, passed by reference.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Link to the external library.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_credits_build_object_link( &$data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = '<a href="' . esc_url( $data[1] ) . '">' . $data[0] . '</a>';
</span></span></pre></div>
<a id="trunksrcwpadmincustombackgroundphp"></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/custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/custom-background.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/custom-background.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,6 @@
</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><span class="cx" style="display: block; padding: 0 10px"> public function take_action() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty($_POST) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +356,6 @@
</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><span class="cx" style="display: block; padding: 0 10px"> public function handle_upload() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty($_FILES) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,6 +432,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param array $form_fields
+ * @return $form_fields
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function attachment_fields_to_edit( $form_fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $form_fields;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,6 +444,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param $tabs
+ * @return $tabs
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_upload_tabs( $tabs ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $tabs;
</span></span></pre></div>
<a id="trunksrcwpadmincustomheaderphp"></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/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/custom-header.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/custom-header.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,7 +317,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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 default_color = '<?php echo $default_color; ?>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -925,6 +924,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Unused since 3.5.0.
</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">+ *
+ * @param array $form_fields
+ * @return $form_fields
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function attachment_fields_to_edit( $form_fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $form_fields;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -934,6 +936,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Unused since 3.5.0.
</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">+ *
+ * @param array $tabs
+ * @return $tabs
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_upload_tabs( $tabs ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $tabs;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -950,6 +955,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Or an array of arguments: attachment_id, url, width, height. All are required.
</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">+ *
+ * @param array|object|string $choice
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final public function set_header_image( $choice ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $choice ) || is_object( $choice ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1001,7 +1008,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final public function remove_header_image() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->set_header_image( 'remove-header' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_header_image( 'remove-header' );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1015,9 +1022,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->process_default_headers();
</span><span class="cx" style="display: block; padding: 0 10px"> $default = get_theme_support( 'custom-header', 'default-image' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $default )
- return $this->remove_header_image();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $default ) {
+ $this->remove_header_image();
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $default_data = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1035,6 +1043,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Calculate width and height based on what the currently selected theme supports.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $dimensions
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array dst_height and dst_width of header image.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final public function get_header_dimensions( $dimensions ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,8 +1093,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Create an attachment 'object'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $cropped Cropped image URL.
- * @param int $parent_attachment_id Attachment ID of parent image.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $cropped Cropped image URL.
+ * @param int $parent_attachment_id Attachment ID of parent image.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Attachment object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1112,7 +1121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Insert an attachment and its metadata.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $object Attachment object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $object Attachment object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $cropped Cropped image URL.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int Attachment ID.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1240,6 +1249,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success();
</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">+ /**
+ *
+ * @param WP_Customize_Manager $wp_customize
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function customize_set_last_used( $wp_customize ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $wp_customize->get_setting( 'header_image_data' )->post_value();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1252,6 +1265,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $attachment_id, $key, time() );
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_default_header_images() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->process_default_headers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1285,10 +1302,13 @@
</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 rest of the set comes after.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $header_images = array_merge( $header_images, $this->default_headers );
- return $header_images;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array_merge( $header_images, $this->default_headers );
</ins><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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_uploaded_header_images() {
</span><span class="cx" style="display: block; padding: 0 10px"> $header_images = get_uploaded_header_images();
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamp_key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
</span></span></pre></div>
<a id="trunksrcwpadminincludesbookmarkphp"></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/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/bookmark.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/bookmark.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $link_id ID of the link to delete
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool True
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return true
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_delete_link( $link_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $linkdata Elements that make up the link to insert.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $wp_error Optional. If true return WP_Error object on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $wp_error Optional. If true return WP_Error object on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_insert_link( $linkdata, $wp_error = false ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></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/class-wp-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,6 +53,9 @@
</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">+ /**
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can('edit_posts');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,8 +161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $comments_per_page The number of comments to list per page.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $comment_status The comment status name. Default 'All'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
- return $comments_per_page;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,13 +232,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $status_links An array of fully-formed status links. Default 'All'.
</span><span class="cx" style="display: block; padding: 0 10px"> * Accepts 'All', 'Pending', 'Approved', 'Spam', and 'Trash'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status_links = apply_filters( 'comment_status_links', $status_links );
- return $status_links;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'comment_status_links', $status_links );
</ins><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><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $comment_status
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @return array
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_bulk_actions() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $comment_status;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,6 +269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $comment_status
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $comment_type
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $which
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function extra_tablenav( $which ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,6 +325,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</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">+ /**
+ * @return string|false
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function current_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return 'delete_all';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,6 +338,7 @@
</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"> * @global int $post_id
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,6 +358,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $columns;
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => 'comment_author',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,6 +418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> * @global object $comment
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param object $a_comment
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function single_row( $a_comment ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,14 +450,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $column_name Current column name
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $primary Primary column name
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|void
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function handle_row_actions( $comment, $column_name, $primary ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $comment_status;
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->user_can ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</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"> $post = get_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,6 +554,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $out;
</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">+ /**
+ *
+ * @param object $comment
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function column_cb( $comment ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->user_can ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,6 +569,7 @@
</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"> * @global string $comment_status
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param object $comment
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_comment( $comment ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -601,6 +618,7 @@
</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"> * @global string $comment_status
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param object $comment
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_author( $comment ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -634,6 +652,10 @@
</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">+ /**
+ *
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function column_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> return get_comment_date( __( 'Y/m/d \a\t g:i a' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -666,6 +688,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo $thumb;
</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">+ /**
+ *
+ * @param object $comment
+ * @param string $column_name
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function column_default( $comment, $column_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when the default column output is displayed for a single row.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,6 +718,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_column_info() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,12 +734,20 @@
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_table_classes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = parent::get_table_classes();
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'comments-box';
</span><span class="cx" style="display: block; padding: 0 10px"> return $classes;
</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">+ /**
+ *
+ * @param bool $output_empty
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function display( $output_empty = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $singular = $this->_args['singular'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,6 +766,11 @@
</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">+ /**
+ *
+ * @param bool $comment_status
+ * @return int
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_per_page( $comment_status = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 10;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystembasephp"></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/class-wp-filesystem-base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The location of the remote path, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function find_folder( $folder ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->cache[ $folder ] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->cache[ $folder ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemftpextphp"></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/class-wp-filesystem-ftpext.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Filesystem_FTPext extends WP_Filesystem_Base {
</span><span class="cx" style="display: block; padding: 0 10px"> public $link;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function __construct($opt='') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @param array $opt
+ */
+ public function __construct( $opt = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->method = 'ftpext';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,6 +62,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['ssl'] = true;
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function connect() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemftpsocketsphp"></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/class-wp-filesystem-ftpsockets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $ftp;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function __construct($opt = '') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @param array $opt
+ */
+ public function __construct( $opt = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->method = 'ftpsockets';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +56,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['password'] = $opt['password'];
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function connect() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->ftp )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,9 +234,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $dir[$file]['group'];
</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">- * @param string $source
- * @param string $destination
- * @param bool $overwrite
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $source
+ * @param string $destination
+ * @param bool $overwrite
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int|bool $mode
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $source
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $destination
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $overwrite
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $overwrite
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function move($source, $destination, $overwrite = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +261,7 @@
</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"> * @param string $file
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $recursive
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $recursive
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $type
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,9 +367,9 @@
</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"> * @param string $path
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param mixed $chmod
- * @param mixed $chown
- * @param mixed $chgrp
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $chmod
+ * @param mixed $chown
+ * @param mixed $chgrp
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,8 +395,8 @@
</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"> * @param string $path
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $include_hidden
- * @param bool $recursive
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $include_hidden
+ * @param bool $recursive
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool|array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemssh2php"></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/class-wp-filesystem-ssh2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $sftp_link;
</span><span class="cx" style="display: block; padding: 0 10px"> public $keys = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function __construct($opt='') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @param array $opt
+ */
+ public function __construct( $opt = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->method = 'ssh2';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,9 +93,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['password'] = $opt['password'];
</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><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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function connect() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->keys ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,8 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $returnbool
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function run_command( $command, $returnbool = false) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function run_command( $command, $returnbool = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->link )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,8 +172,8 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $file
- * @param string $contents
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $file
+ * @param string $contents
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param bool|int $mode
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,6 +188,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function cwd() {
</span><span class="cx" style="display: block; padding: 0 10px"> $cwd = $this->run_command('pwd');
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $cwd ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +211,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $file
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $group
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $recursive
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $recursive
+ *
+ * @return bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function chgrp($file, $group, $recursive = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->exists($file) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,8 +225,8 @@
</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"> * @param string $file
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $mode
- * @param bool $recursive
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $mode
+ * @param bool $recursive
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool|string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function chmod($file, $mode = false, $recursive = false) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,9 +301,9 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $source
- * @param string $destination
- * @param bool $overwrite
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $source
+ * @param string $destination
+ * @param bool $overwrite
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int|bool $mode
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $source
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $destination
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $overwrite
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $overwrite
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function move($source, $destination, $overwrite = false) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,8 +327,8 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $file
- * @param bool $recursive
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $file
+ * @param bool $recursive
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|bool $type
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,8 +415,8 @@
</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"> * @param string $file
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $time
- * @param int $atime
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $time
+ * @param int $atime
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function touch($file, $time = 0, $atime = 0) {
</span><span class="cx" style="display: block; padding: 0 10px"> //Not implemented.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,9 +424,9 @@
</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"> * @param string $path
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param mixed $chmod
- * @param mixed $chown
- * @param mixed $chgrp
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $chmod
+ * @param mixed $chown
+ * @param mixed $chgrp
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,7 +447,7 @@
</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"> * @param string $path
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $recursive
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $recursive
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function rmdir($path, $recursive = false) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,8 +456,8 @@
</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"> * @param string $path
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $include_hidden
- * @param bool $recursive
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $include_hidden
+ * @param bool $recursive
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool|array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function dirlist($path, $include_hidden = true, $recursive = false) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpimporterphp"></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/class-wp-importer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-importer.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-importer.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,6 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $importer_name
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $bid
</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">@@ -53,6 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $importer_name
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $bid
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,6 +122,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $hashtable;
</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">+ /**
+ *
+ * @param int $blog_id
+ * @return int|void
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function set_blog( $blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $blog_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = (int) $blog_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,6 +154,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $blog_id;
</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">+ /**
+ *
+ * @param int $user_id
+ * @return int|void
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function set_user( $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $user_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = (int) $user_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $username
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $password
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $head
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $head
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_page( $url, $username = '', $password = '', $head = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Exits when a required param is not set.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $param
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $required
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $required
</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_cli_args( $param, $required = false ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplinkslisttablephp"></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/class-wp-links-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-links-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-links-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +26,10 @@
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( 'manage_links' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +64,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'No links found.' );
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_bulk_actions() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['delete'] = __( 'Delete' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,6 +107,10 @@
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cb' => '<input type="checkbox" />',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,6 +123,10 @@
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'name',
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></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/class-wp-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,6 +250,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An associative array with information about the pagination
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param array|string $args
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function set_pagination_args( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +457,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool The action name or False if no action was selected
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false The action name or False if no action was selected
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function current_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,7 +978,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $singular = $this->_args['singular'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->display_tablenav( 'top' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1092,8 +1093,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</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">+ /**
+ *
+ * @param object $item
+ * @param string $column_name
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function column_default( $item, $column_name ) {}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @param object $item
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function column_cb( $item ) {}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></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/class-wp-media-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +37,10 @@
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can('upload_files');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,6 +109,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $type_links;
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_bulk_actions() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( MEDIA_TRASH ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,6 +159,10 @@
</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">+ /**
+ *
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function current_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return 'attach';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,6 +176,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return parent::current_action();
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function has_items() {
</span><span class="cx" style="display: block; padding: 0 10px"> return have_posts();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,6 +237,10 @@
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_columns = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_columns['cb'] = '<input type="checkbox" />';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,11 +291,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $detached Whether the list table contains media not attached
</span><span class="cx" style="display: block; padding: 0 10px"> * to any posts. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts_columns = apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
-
- return $posts_columns;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
</ins><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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'title',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,7 +517,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if( $primary === $column_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</td>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,6 +541,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $att_title
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @return array
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function _get_row_actions( $post, $att_title ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,8 +591,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $detached Whether the list table contains media not attached
</span><span class="cx" style="display: block; padding: 0 10px"> * to any posts. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions = apply_filters( 'media_row_actions', $actions, $post, $this->detached );
-
- return $actions;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'media_row_actions', $actions, $post, $this->detached );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></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/class-wp-ms-sites-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +26,10 @@
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( 'manage_sites' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,6 +146,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'No sites found.' );
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_bulk_actions() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'delete_sites' ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,6 +174,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->view_switcher( $mode );
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> $blogname_columns = ( is_subdomain_install() ) ? __( 'Domain' ) : __( 'Path' );
</span><span class="cx" style="display: block; padding: 0 10px"> $sites_columns = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,11 +199,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $sites_columns An array of displayed site columns. Default 'cb',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'blogname', 'lastupdated', 'registered', 'users'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sites_columns = apply_filters( 'wpmu_blogs_columns', $sites_columns );
-
- return $sites_columns;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'wpmu_blogs_columns', $sites_columns );
</ins><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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogname' => 'blogname',
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></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/class-wp-ms-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,11 +47,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_table_classes() {
</span><span class="cx" style="display: block; padding: 0 10px"> // todo: remove and add CSS for .themes
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'widefat', 'plugins' );
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_site_themes )
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( 'manage_sites' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,6 +231,10 @@
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'name',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,8 +303,8 @@
</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">+ * @global string $status
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $status
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_bulk_actions() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,6 +334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $page
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $s
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $totals
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Theme $theme
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function single_row( $theme ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></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/class-wp-ms-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_MS_Users_List_Table extends WP_List_Table {
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( 'manage_network_users' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,6 +82,10 @@
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_bulk_actions() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'delete_users' ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,6 +134,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->view_switcher( $mode );
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> $users_columns = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cb' => '<input type="checkbox" />',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,11 +155,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $users_columns An array of user columns. Default 'cb', 'username',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'name', 'email', 'registered', 'blogs'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users_columns = apply_filters( 'wpmu_users_columns', $users_columns );
-
- return $users_columns;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'wpmu_users_columns', $users_columns );
</ins><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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'username' => 'login',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<td $attributes>";
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $column_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'username':
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar = get_avatar( $user->user_email, 32 );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></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/class-wp-plugin-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> private $error;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can('install_plugins');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +32,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"> * @access protected
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @return array
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_installed_plugin_slugs() {
</span><span class="cx" style="display: block; padding: 0 10px"> $slugs = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,6 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $tabs
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $tab
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_views() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,10 +332,16 @@
</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">+ /**
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_table_classes() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'widefat', $this->_args['plural'] );
</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">+
+ /**
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></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/class-wp-plugins-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,10 +40,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page = $this->get_pagenum();
</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">+ /**
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_table_classes() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'widefat', $this->_args['plural'] );
</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">+ /**
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can('activate_plugins');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @staticvar string $term
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $plugin
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return boolean
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _search_callback( $plugin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> static $term = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,6 +288,9 @@
</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">+ /**
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</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">@@ -365,7 +374,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $status
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $which
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function bulk_actions( $which = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $status;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +387,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $status
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $which
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function extra_tablenav( $which ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $status;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,6 +406,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</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">+ /**
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function current_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($_POST['clear-recent-list']) )
</span><span class="cx" style="display: block; padding: 0 10px"> return 'clear-recent-list';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,6 +435,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $page
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $s
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $totals
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $item
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function single_row( $item ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></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/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,6 +100,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->hierarchical_display = $display;
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,6 +151,10 @@
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function has_items() {
</span><span class="cx" style="display: block; padding: 0 10px"> return have_posts();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +171,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool Whether the current ivew is the "All" view.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool Whether the current view is the "All" view.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function is_base_request() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_GET ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,6 +262,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $status_links;
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_bulk_actions() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_obj = get_post_type_object( $this->screen->post_type );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,6 +335,10 @@
</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">+ /**
+ *
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function current_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return 'delete_all';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,10 +359,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->view_switcher( $mode );
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_table_classes() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = $this->screen->post_type;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,11 +451,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $post_columns An array of column names.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts_columns = apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
-
- return $posts_columns;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
</ins><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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'title',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,7 +514,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $pages
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $pagenum
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $per_page
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return false|null
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,7 +524,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_pages( array( 'sort_column' => 'menu_order' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $pages )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return;
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +621,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $to_display List of pages to be displayed. Passed by reference.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $children_pages[$parent] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,7 +628,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $end = $start + $per_page;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $children_pages[$parent] as $page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $count >= $end )
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></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/class-wp-terms-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,6 +55,10 @@
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,6 +118,10 @@
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function has_items() {
</span><span class="cx" style="display: block; padding: 0 10px"> // todo: populate $this->items in prepare_items()
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,6 +131,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_taxonomy( $this->screen->taxonomy )->labels->not_found;
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_bulk_actions() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['delete'] = __( 'Delete' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,6 +142,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $actions;
</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">+ /**
+ *
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function current_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return 'bulk-delete';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,6 +153,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return parent::current_action();
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> $columns = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cb' => '<input type="checkbox" />',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,6 +174,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $columns;
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'name',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,11 +241,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $terms
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $children
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $start
- * @param int $per_page
- * @param int $count
- * @param int $parent
- * @param int $level
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $start
+ * @param int $per_page
+ * @param int $count
+ * @param int $parent
+ * @param int $level
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></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/class-wp-theme-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public $features = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( 'install_themes' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,6 +420,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $tab Current tab within Themes->Install screen
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $type Type of search.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param array $extra_args Unused.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _js_vars( $extra_args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $tab, $type;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeslisttablephp"></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/class-wp-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,6 +29,10 @@
</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">+ /**
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Do not check edit_theme_options here. AJAX calls for available themes require switch_themes.
</span><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( 'switch_themes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +101,6 @@
</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"> * @param string $which
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function tablenav( $which = 'top' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,6 +127,10 @@
</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">+ /**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></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/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,6 +56,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"> * @access public
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @return bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function ajax_user_can() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_site_users )
</span></span></pre></div>
<a id="trunksrcwpadminincludescommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/comment.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/comment.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,11 +20,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function comment_exists($comment_author, $comment_date) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_author = stripslashes($comment_author);
- $comment_date = stripslashes($comment_date);
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- WHERE comment_author = %s AND comment_date = %s", $comment_author, $comment_date) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WHERE comment_author = %s AND comment_date = %s",
+ stripslashes( $comment_author ),
+ stripslashes( $comment_date )
+ ) );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,6 @@
</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><span class="cx" style="display: block; padding: 0 10px"> function edit_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +79,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @param int $id ID of comment to retrieve.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|object Comment if found. False on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return object|false Comment if found. False on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_to_edit( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$comment = get_comment($id) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Add avatars to relevant places in admin, or try to.
</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><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">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global object $comment
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name User name.
</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-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/template.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,10 +438,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_List_Table $wp_list_table
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $position
- * @param bool $checkbox
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $position
+ * @param bool $checkbox
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $mode
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $table_row
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $table_row
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) {
</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">@@ -1038,9 +1038,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_meta_boxes
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @staticvar bool $already_sorted
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|WP_Screen $screen Screen identifier
- * @param string $context box context
- * @param mixed $object gets passed to the box callback function as first parameter
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|WP_Screen $screen Screen identifier
+ * @param string $context box context
+ * @param mixed $object gets passed to the box callback function as first parameter
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int number of meta_boxes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function do_meta_boxes( $screen, $context, $object ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1107,9 +1107,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_meta_boxes
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $id String for use in the 'id' attribute of tags.
- * @param string|object $screen The screen on which to show the box (post, page, link).
- * @param string $context The context within the page where the boxes should show ('normal', 'advanced').
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $id String for use in the 'id' attribute of tags.
+ * @param string|object $screen The screen on which to show the box (post, page, link).
+ * @param string $context The context within the page where the boxes should show ('normal', 'advanced').
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_meta_box($id, $screen, $context) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_meta_boxes;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1143,9 +1143,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses global $wp_meta_boxes Used to retrieve registered meta boxes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|object $screen The screen identifier.
- * @param string $context The meta box context.
- * @param mixed $object gets passed to the section callback function as first parameter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|object $screen The screen identifier.
+ * @param string $context The meta box context.
+ * @param mixed $object gets passed to the section callback function as first parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int number of meta boxes as accordion sections.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function do_accordion_sections( $screen, $context, $object ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1221,10 +1221,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global $wp_settings_sections Storage array of all settings sections added to admin pages
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags.
- * @param string $title Formatted title of the section. Shown as the heading for the section.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags.
+ * @param string $title Formatted title of the section. Shown as the heading for the section.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $callback Function that echos out any content at the top of the section (between heading and fields).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page();
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_settings_section($id, $title, $callback, $page) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_settings_sections;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1700,6 +1700,10 @@
</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">+/**
+ *
+ * @param WP_Post $post
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function _post_states($post) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_states = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['post_status'] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1750,6 +1754,10 @@
</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">+/**
+ *
+ * @param WP_Post $post
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function _media_states( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $media_states = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet = get_option('stylesheet');
</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-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/theme-install.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,6 +50,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Display search form for searching themes.
</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">+ *
+ * @param bool $type_selector
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function install_theme_search_form( $type_selector = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,6 +152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Theme_Install_List_Table $wp_list_table
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param object $theme
</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></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-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/theme.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return mixed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return void|bool|WP_Error When void, echoes content.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function delete_theme($stylesheet, $redirect = '') {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_filesystem;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_theme_update_available()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param object $theme Theme data object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Theme $theme Theme data object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function theme_update_available( $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_theme_update_available( $theme );
</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-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/update-core.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,7 +777,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $required_mysql_version
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $from New release unzipped path.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $to Path to old WordPress installation.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $to Path to old WordPress installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Error|null WP_Error on failure, null on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function update_core($from, $to) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1118,8 +1118,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Filesystem_Base $wp_filesystem
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $from source directory
- * @param string $to destination directory
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $from source directory
+ * @param string $to destination directory
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $skip_list a list of files/folders to skip copying
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed WP_Error on failure, True on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1176,6 +1176,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $wp_version
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $pagenow
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $action
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param string $new_version
</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></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-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/update.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Selects the first update version from the update_core option.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|object The response from the API on success, false on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return object|array|false The response from the API on success, false on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_preferred_from_update_core() {
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = get_core_updates();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,8 +24,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Get available core updates.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * set $options['available'] to false to skip not-dismissed updates.
- * @return bool|array Array of the update objects on success, false on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * set $options['available'] to false to skip not-dismissed updates.
+ * @return array|false Array of the update objects on success, false on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_core_updates( $options = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,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><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|array False on failure, otherwise the core update offering.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|false False on failure, otherwise the core update offering.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function find_core_auto_update() {
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = get_site_transient( 'update_core' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,12 +128,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $body['checksums'];
</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">+/**
+ *
+ * @param object $update
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function dismiss_core_update( $update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dismissed = get_site_option( 'dismissed_update_core' );
</span><span class="cx" style="display: block; padding: 0 10px"> $dismissed[ $update->current . '|' . $update->locale ] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> return update_site_option( 'dismissed_update_core', $dismissed );
</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">+/**
+ *
+ * @param string $version
+ * @param string $locale
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function undismiss_core_update( $version, $locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dismissed = get_site_option( 'dismissed_update_core' );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = $version . '|' . $locale;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,6 +156,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return update_site_option( 'dismissed_update_core', $dismissed );
</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">+/**
+ *
+ * @param string $version
+ * @param string $locale
+ * @return object|false
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function find_core_update( $version, $locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $from_api = get_site_transient( 'update_core' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,6 +176,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">+/**
+ *
+ * @param string $msg
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function core_update_footer( $msg = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('update_core') )
</span><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,6 +286,12 @@
</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">+/**
+ *
+ * @param string $file
+ * @param array $plugin_data
+ * @return false|void
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function wp_plugin_update_row( $file, $plugin_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current = get_site_transient( 'update_plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $current->response[ $file ] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,6 +358,10 @@
</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">+/**
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_theme_updates() {
</span><span class="cx" style="display: block; padding: 0 10px"> $current = get_site_transient('update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,6 +391,12 @@
</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">+/**
+ *
+ * @param string $theme_key
+ * @param WP_Theme $theme
+ * @return false|void
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function wp_theme_update_row( $theme_key, $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current = get_site_transient( 'update_themes' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $current->response[ $theme_key ] ) )
</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-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/upgrade.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,22 +165,22 @@
</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"> $wpdb->insert( $wpdb->posts, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_author' => $user_id,
- 'post_date' => $now,
- 'post_date_gmt' => $now_gmt,
- 'post_content' => $first_post,
- 'post_excerpt' => '',
- 'post_title' => __('Hello world!'),
- /* translators: Default post slug */
- 'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
- 'post_modified' => $now,
- 'post_modified_gmt' => $now_gmt,
- 'guid' => $first_post_guid,
- 'comment_count' => 1,
- 'to_ping' => '',
- 'pinged' => '',
- 'post_content_filtered' => ''
- ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_author' => $user_id,
+ 'post_date' => $now,
+ 'post_date_gmt' => $now_gmt,
+ 'post_content' => $first_post,
+ 'post_excerpt' => '',
+ 'post_title' => __('Hello world!'),
+ /* translators: Default post slug */
+ 'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
+ 'post_modified' => $now,
+ 'post_modified_gmt' => $now_gmt,
+ 'guid' => $first_post_guid,
+ 'comment_count' => 1,
+ 'to_ping' => '',
+ 'pinged' => '',
+ 'post_content_filtered' => ''
+ ));
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Default comment
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,14 +194,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $first_comment = get_site_option( 'first_comment', $first_comment );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->comments, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment_post_ID' => 1,
- 'comment_author' => $first_comment_author,
- 'comment_author_email' => '',
- 'comment_author_url' => $first_comment_url,
- 'comment_date' => $now,
- 'comment_date_gmt' => $now_gmt,
- 'comment_content' => $first_comment
- ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment_post_ID' => 1,
+ 'comment_author' => $first_comment_author,
+ 'comment_author_email' => '',
+ 'comment_author_url' => $first_comment_url,
+ 'comment_date' => $now,
+ 'comment_date_gmt' => $now_gmt,
+ 'comment_content' => $first_comment
+ ));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // First Page
</span><span class="cx" style="display: block; padding: 0 10px"> $first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,22 +217,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $first_page = get_site_option( 'first_page', $first_page );
</span><span class="cx" style="display: block; padding: 0 10px"> $first_post_guid = get_option('home') . '/?page_id=2';
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->posts, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_author' => $user_id,
- 'post_date' => $now,
- 'post_date_gmt' => $now_gmt,
- 'post_content' => $first_page,
- 'post_excerpt' => '',
- 'post_title' => __( 'Sample Page' ),
- /* translators: Default page slug */
- 'post_name' => __( 'sample-page' ),
- 'post_modified' => $now,
- 'post_modified_gmt' => $now_gmt,
- 'guid' => $first_post_guid,
- 'post_type' => 'page',
- 'to_ping' => '',
- 'pinged' => '',
- 'post_content_filtered' => ''
- ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_author' => $user_id,
+ 'post_date' => $now,
+ 'post_date_gmt' => $now_gmt,
+ 'post_content' => $first_page,
+ 'post_excerpt' => '',
+ 'post_title' => __( 'Sample Page' ),
+ /* translators: Default page slug */
+ 'post_name' => __( 'sample-page' ),
+ 'post_modified' => $now,
+ 'post_modified_gmt' => $now_gmt,
+ 'guid' => $first_post_guid,
+ 'post_type' => 'page',
+ 'to_ping' => '',
+ 'pinged' => '',
+ 'post_content_filtered' => ''
+ ));
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up default widgets for default theme.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,8 +392,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $wp_current_db_version
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $wp_db_version
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @return null If no update is necessary or site isn't completely installed, null.
</del><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="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wp_db_version, $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,8 +443,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $wp_current_db_version
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $wp_db_version
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @return null If no update is necessary, null.
</del><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="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wp_db_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1747,7 +1743,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool True, when finished.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return true True, when finished.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function drop_index($table, $index) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1770,7 +1766,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool True, when done with execution.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return true True, when done with execution.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_clean_index($table, $index) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1789,7 +1785,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return True if already exists or on successful completion, false on error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if already exists or on successful completion, false on error.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function maybe_add_column($table_name, $column_name, $create_ddl) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2278,7 +2274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't copy anything.
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">+ }
</ins><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"> if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2331,7 +2327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $theme_name The name of the theme.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $template The directory name of the theme.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null|false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|void
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function make_site_theme_from_default($theme_name, $template) {
</span><span class="cx" style="display: block; padding: 0 10px"> $site_dir = WP_CONTENT_DIR . "/themes/$template";
</span></span></pre></div>
<a id="trunksrcwpadminincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/user.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null|WP_Error|int Null when adding user, WP_Error or User ID integer when no parameters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return int|WP_Error WP_Error or User ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_user() {
</span><span class="cx" style="display: block; padding: 0 10px"> return edit_user();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id Optional. User ID.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return int user id of the updated user
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return int|WP_Error user id of the updated user
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function edit_user( $user_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_roles = wp_roles();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,6 +410,9 @@
</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"> * @since 2.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param int $user_ID
+ * @param object $old_data
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function default_password_nag_edit_user($user_ID, $old_data) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Short-circuit it.
</span></span></pre></div>
<a id="trunksrcwpadminincludeswidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/widgets.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/includes/widgets.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,6 +54,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"> * @access private
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @return int
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _sort_name_callback( $a, $b ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return strnatcasecmp( $a['name'], $b['name'] );
</span></span></pre></div>
<a id="trunksrcwpadmininstallhelperphp"></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/install-helper.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install-helper.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/install-helper.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,12 +157,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $table_name Table name
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $col_name Column name
- * @param string $col_type Column type
- * @param bool $is_null Optional. Check is null.
- * @param mixed $key Optional. Key info.
- * @param mixed $default Optional. Default value.
- * @param mixed $extra Optional. Extra value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $col_name Column name
+ * @param string $col_type Column type
+ * @param bool $is_null Optional. Check is null.
+ * @param mixed $key Optional. Key info.
+ * @param mixed $default Optional. Default value.
+ * @param mixed $extra Optional. Extra value.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, if matches. False, if not matching.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) {
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></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/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/install.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Display install header.
</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">+ *
+ * @param string $body_classes
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function display_header( $body_classes = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: text/html; charset=utf-8' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,6 +84,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Display installer setup 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">+ *
+ * @param string|null $error
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function display_setup_form( $error = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span></span></pre></div>
<a id="trunksrcwpadminloadstylesphp"></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/load-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-styles.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/load-styles.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,6 +81,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_guess_url() {}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @param string $path
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_file($path) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists('realpath') )
</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-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/menu.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,8 +170,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $appearance_cap );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add 'Editor' to the bottom of the Appearance menu.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! is_multisite() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_multisite() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action('admin_menu', '_add_themes_utility_last', 101);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
+/**
+ *
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function _add_themes_utility_last() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook
</span><span class="cx" style="display: block; padding: 0 10px"> add_submenu_page('themes.php', _x('Editor', 'theme editor'), _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></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/network/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/network/users.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,6 +16,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network_users' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'You do not have permission to access this page.' ), 403 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @param array $users
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function confirm_delete_users( $users ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = wp_get_current_user();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $users ) || empty( $users ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminnetworkphp"></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/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/network.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,6 +157,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @global bool $is_apache
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param WP_Error $errors
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function network_step1( $errors = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $is_apache;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,6 +338,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param WP_Error $errors
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function network_step2( $errors = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span></span></pre></div>
<a id="trunksrcwpadminpluginsphp"></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/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/plugins.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,6 +148,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
</span><span class="cx" style="display: block; padding: 0 10px"> // Go back to "sandbox" scope so we get the same errors as before
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @param string $plugin
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function plugin_sandbox_scrape( $plugin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
</span><span class="cx" style="display: block; padding: 0 10px"> include( WP_PLUGIN_DIR . '/' . $plugin );
</span></span></pre></div>
<a id="trunksrcwpadminpostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/post.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = 6;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = 'draft' == $status ? 10 : 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = 'draft' == $status ? 10 : 1;
</ins><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"> $location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></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/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/setup-config.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,12 +64,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ignore
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> * @global string $wp_local_package
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Locale $wp_locale
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param string|array $body_classes
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function setup_config_display_header( $body_classes = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
</del><span class="cx" style="display: block; padding: 0 10px"> $body_classes = (array) $body_classes;
</span><span class="cx" style="display: block; padding: 0 10px"> $body_classes[] = 'wp-core-ui';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_rtl() ) {
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/update-core.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,7 +314,6 @@
</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"> $form_action = 'update-core.php?action=do-theme-upgrade';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Themes' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click “Update Themes”.' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,6 +380,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Filesystem_Base $wp_filesystem Subclass
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param bool $reinstall
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function do_core_upgrade( $reinstall = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_filesystem;
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></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/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/user-new.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,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"> if ( is_multisite() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @param string $text
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function admin_created_user_email( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $roles = get_editable_roles();
</span><span class="cx" style="display: block; padding: 0 10px"> $role = $roles[ $_REQUEST['role'] ];
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets.php 2015-05-29 17:03:13 UTC (rev 32653)
+++ trunk/src/wp-admin/widgets.php 2015-05-29 20:16:22 UTC (rev 32654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> set_user_setting( 'widgets_access', $widgets_access );
</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">+/**
+ *
+ * @param string $classes
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function wp_widgets_access_body_class($classes) {
</span><span class="cx" style="display: block; padding: 0 10px"> return "$classes widgets_access ";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>