<!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>[32874] trunk/src/wp-includes: Customizer et al, use `elseif` in PHP, not `else if`.</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/32874">32874</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/32874","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-06-19 22:00:33 +0000 (Fri, 19 Jun 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'>Customizer et al, use `elseif` in PHP, not `else if`.
This was corrected via brute force in <a href="https://core.trac.wordpress.org/changeset/31090">[31090]</a>.
See <a href="https://core.trac.wordpress.org/ticket/32444">#32444</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizesettingphp">trunk/src/wp-includes/class-wp-customize-setting.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2015-06-19 21:54:37 UTC (rev 32873)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2015-06-19 22:00:33 UTC (rev 32874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => (int) $post->ID,
</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">- } else if ( 'taxonomy' === $obj_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'taxonomy' === $obj_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( $taxonomy_or_post_type, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => WP_Customize_Nav_Menu_Setting::TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match( WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => WP_Customize_Nav_Menu_Item_Setting::TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_class = 'WP_Customize_Nav_Menu_Setting';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting_class = 'WP_Customize_Nav_Menu_Item_Setting';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $setting_class;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizesettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-setting.php 2015-06-19 21:54:37 UTC (rev 32873)
+++ trunk/src/wp-includes/class-wp-customize-setting.php 2015-06-19 22:00:33 UTC (rev 32874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,7 +858,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post_type' === $value['type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = get_the_title( $value['object_id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'taxonomy' === $value['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'taxonomy' === $value['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_title = get_term_field( 'name', $value['object_id'], $value['object'], 'raw' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $original_title ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1737,7 +1737,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $i = array_search( $menu_id, $nav_menu_options['auto_add'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $auto_add && false === $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_push( $nav_menu_options['auto_add'], $this->term_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! $auto_add && false !== $i ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $auto_add && false !== $i ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> array_splice( $nav_menu_options['auto_add'], $i, 1 );
</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="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2015-06-19 21:54:37 UTC (rev 32873)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2015-06-19 22:00:33 UTC (rev 32874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,7 +747,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( $this->setting_id_patterns['sidebar_widgets'], $id, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['sanitize_callback'] = array( $this, 'sanitize_sidebar_widgets' );
</span><span class="cx" style="display: block; padding: 0 10px"> $args['sanitize_js_callback'] = array( $this, 'sanitize_sidebar_widgets_js_instance' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( $this->setting_id_patterns['widget_instance'], $id, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match( $this->setting_id_patterns['widget_instance'], $id, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['sanitize_callback'] = array( $this, 'sanitize_widget_instance' );
</span><span class="cx" style="display: block; padding: 0 10px"> $args['sanitize_js_callback'] = array( $this, 'sanitize_widget_js_instance' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2015-06-19 21:54:37 UTC (rev 32873)
+++ trunk/src/wp-includes/comment.php 2015-06-19 22:00:33 UTC (rev 32874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -972,9 +972,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = "$wpdb->commentmeta.meta_value";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( $orderby == 'meta_value_num' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $orderby == 'meta_value_num' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed = "$wpdb->commentmeta.meta_value+0";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( in_array( $orderby, $allowed_keys ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $orderby, $allowed_keys ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $meta_query_clauses[ $orderby ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_clause = $meta_query_clauses[ $orderby ];
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2015-06-19 21:54:37 UTC (rev 32873)
+++ trunk/src/wp-includes/link-template.php 2015-06-19 22:00:33 UTC (rev 32874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,7 +920,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $object_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['post_type'] = $object_type;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! empty( $tax->object_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $tax->object_type ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['post_type'] = reset( $tax->object_type );
</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="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2015-06-19 21:54:37 UTC (rev 32873)
+++ trunk/src/wp-includes/taxonomy.php 2015-06-19 22:00:33 UTC (rev 32874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2712,11 +2712,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $orderby, array( 'term_id', 'name', 'slug', 'term_group' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "t.$orderby";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( in_array( $orderby, array( 'count', 'parent', 'taxonomy', 'term_taxonomy_id' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $orderby, array( 'count', 'parent', 'taxonomy', 'term_taxonomy_id' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderby = "tt.$orderby";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'term_order' === $orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'term_order' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderby = 'tr.term_order';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'none' === $orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'none' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderby = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $order = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2015-06-19 21:54:37 UTC (rev 32873)
+++ trunk/src/wp-includes/user.php 2015-06-19 22:00:33 UTC (rev 32874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,7 +721,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $qv['orderby'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Default order is by 'user_login'.
</span><span class="cx" style="display: block; padding: 0 10px"> $ordersby = array( 'user_login' => $order );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( is_array( $qv['orderby'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_array( $qv['orderby'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ordersby = $qv['orderby'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // 'orderby' values may be a comma- or space-separated list.
</span></span></pre>
</div>
</div>
</body>
</html>