<!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>[25256] trunk/src/wp-admin/includes/update.php: Remove redundant checks in some update functions.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25256">25256</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-05 17:04:03 +0000 (Thu, 05 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove redundant checks in some update functions. Adds some readability/coding standards cleanup.
Props miqrogroove, azaozz.
Fixes <a href="http://core.trac.wordpress.org/ticket/22828">#22828</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/update.php (25255 => 25256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/update.php 2013-09-05 16:56:36 UTC (rev 25255)
+++ trunk/src/wp-admin/includes/update.php 2013-09-05 17:04:03 UTC (rev 25256)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx"> */
</span><span class="cx"> function get_preferred_from_update_core() {
</span><span class="cx"> $updates = get_core_updates();
</span><del>- if ( !is_array( $updates ) )
</del><ins>+ if ( ! is_array( $updates ) )
</ins><span class="cx"> return false;
</span><span class="cx"> if ( empty( $updates ) )
</span><del>- return (object)array('response' => 'latest');
</del><ins>+ return (object) array( 'response' => 'latest' );
</ins><span class="cx"> return $updates[0];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -30,26 +30,29 @@
</span><span class="cx"> * @return array Array of the update objects
</span><span class="cx"> */
</span><span class="cx"> function get_core_updates( $options = array() ) {
</span><del>- $options = array_merge( array('available' => true, 'dismissed' => false ), $options );
</del><ins>+ $options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
</ins><span class="cx"> $dismissed = get_site_option( 'dismissed_update_core' );
</span><del>- if ( !is_array( $dismissed ) ) $dismissed = array();
</del><ins>+
+ if ( ! is_array( $dismissed ) )
+ $dismissed = array();
+
</ins><span class="cx"> $from_api = get_site_transient( 'update_core' );
</span><del>- if ( empty($from_api) )
</del><ins>+
+ if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
</ins><span class="cx"> return false;
</span><del>- if ( !isset( $from_api->updates ) || !is_array( $from_api->updates ) ) return false;
</del><ins>+
</ins><span class="cx"> $updates = $from_api->updates;
</span><del>- if ( !is_array( $updates ) ) return false;
</del><span class="cx"> $result = array();
</span><del>- foreach($updates as $update) {
- if ( array_key_exists( $update->current.'|'.$update->locale, $dismissed ) ) {
</del><ins>+ foreach ( $updates as $update ) {
+ if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
</ins><span class="cx"> if ( $options['dismissed'] ) {
</span><span class="cx"> $update->dismissed = true;
</span><del>- $result[]= $update;
</del><ins>+ $result[] = $update;
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if ( $options['available'] ) {
</span><span class="cx"> $update->dismissed = false;
</span><del>- $result[]= $update;
</del><ins>+ $result[] = $update;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -58,23 +61,29 @@
</span><span class="cx">
</span><span class="cx"> function dismiss_core_update( $update ) {
</span><span class="cx"> $dismissed = get_site_option( 'dismissed_update_core' );
</span><del>- $dismissed[ $update->current.'|'.$update->locale ] = true;
</del><ins>+ $dismissed[ $update->current . '|' . $update->locale ] = true;
</ins><span class="cx"> return update_site_option( 'dismissed_update_core', $dismissed );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function undismiss_core_update( $version, $locale ) {
</span><span class="cx"> $dismissed = get_site_option( 'dismissed_update_core' );
</span><del>- $key = $version.'|'.$locale;
- if ( !isset( $dismissed[$key] ) ) return false;
</del><ins>+ $key = $version . '|' . $locale;
+
+ if ( ! isset( $dismissed[$key] ) )
+ return false;
+
</ins><span class="cx"> unset( $dismissed[$key] );
</span><span class="cx"> return update_site_option( 'dismissed_update_core', $dismissed );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function find_core_update( $version, $locale ) {
</span><span class="cx"> $from_api = get_site_transient( 'update_core' );
</span><del>- if ( !is_array( $from_api->updates ) ) return false;
</del><ins>+
+ if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+ return false;
+
</ins><span class="cx"> $updates = $from_api->updates;
</span><del>- foreach($updates as $update) {
</del><ins>+ foreach ( $updates as $update ) {
</ins><span class="cx"> if ( $update->current == $version && $update->locale == $locale )
</span><span class="cx"> return $update;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>