<!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>[55648] trunk/src/wp-includes/class-wp-editor.php: Coding Standards: Rename the `$qtInit` and `$mceInit` variables in `_WP_Editors`.</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 { white-space: pre-line; 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/55648">55648</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/55648","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-04-12 09:41:21 +0000 (Wed, 12 Apr 2023)</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'>Coding Standards: Rename the `$qtInit` and `$mceInit` variables in `_WP_Editors`.
This resolves 37 WPCS warnings along the lines of:
{{{
Variable "$qtInit" is not in valid snake_case format, try "$qt_init"
Variable "$mceInit" is not in valid snake_case format, try "$mce_init"
}}}
Follow-up to <a href="https://core.trac.wordpress.org/changeset/18498">[18498]</a>.
See <a href="https://core.trac.wordpress.org/ticket/57839">#57839</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></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-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2023-04-11 22:24:35 UTC (rev 55647)
+++ trunk/src/wp-includes/class-wp-editor.php 2023-04-12 09:41:21 UTC (rev 55648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,21 +329,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self::$this_quicktags ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qtInit = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qt_init = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => $editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'buttons' => '',
</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_array( $set['quicktags'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qtInit = array_merge( $qtInit, $set['quicktags'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qt_init = array_merge( $qt_init, $set['quicktags'] );
</ins><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">- if ( empty( $qtInit['buttons'] ) ) {
- $qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $qt_init['buttons'] ) ) {
+ $qt_init['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
</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 ( $set['_content_editor_dfw'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qtInit['buttons'] .= ',dfw';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qt_init['buttons'] .= ',dfw';
</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">@@ -351,14 +351,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $qtInit Quicktags settings.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $qt_init Quicktags settings.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $editor_id Unique editor identifier, e.g. 'content'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qtInit = apply_filters( 'quicktags_settings', $qtInit, $editor_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qt_init = apply_filters( 'quicktags_settings', $qt_init, $editor_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$qt_settings[ $editor_id ] = $qtInit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$qt_settings[ $editor_id ] = $qt_init;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$qt_buttons = array_merge( self::$qt_buttons, explode( ',', $qtInit['buttons'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$qt_buttons = array_merge( self::$qt_buttons, explode( ',', $qt_init['buttons'] ) );
</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 ( self::$this_tinymce ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,7 +753,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $set['tinymce']['body_class'] );
</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">- $mceInit = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mce_init = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => "#$editor_id",
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpautop' => (bool) $set['wpautop'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'indent' => ! $set['wpautop'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -766,10 +766,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"> // Merge with the first part of the init array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mceInit = array_merge( self::$first_init, $mceInit );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mce_init = array_merge( self::$first_init, $mce_init );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $set['tinymce'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mceInit = array_merge( $mceInit, $set['tinymce'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mce_init = array_merge( $mce_init, $set['tinymce'] );
</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">@@ -788,10 +788,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0 The `$editor_id` parameter was added.
</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 $mceInit An array with teenyMCE config.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $mce_init An array with teenyMCE config.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $editor_id Unique editor identifier, e.g. 'content'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mceInit = apply_filters( 'teeny_mce_before_init', $mceInit, $editor_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mce_init = apply_filters( 'teeny_mce_before_init', $mce_init, $editor_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</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">@@ -800,19 +800,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0 The `$editor_id` parameter was added.
</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 $mceInit An array with TinyMCE config.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $mce_init An array with TinyMCE config.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $editor_id Unique editor identifier, e.g. 'content'. Accepts 'classic-block'
</span><span class="cx" style="display: block; padding: 0 10px"> * when called from block editor's Classic block.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mceInit = apply_filters( 'tiny_mce_before_init', $mceInit, $editor_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mce_init = apply_filters( 'tiny_mce_before_init', $mce_init, $editor_id );
</ins><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">- if ( empty( $mceInit['toolbar3'] ) && ! empty( $mceInit['toolbar4'] ) ) {
- $mceInit['toolbar3'] = $mceInit['toolbar4'];
- $mceInit['toolbar4'] = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $mce_init['toolbar3'] ) && ! empty( $mce_init['toolbar4'] ) ) {
+ $mce_init['toolbar3'] = $mce_init['toolbar4'];
+ $mce_init['toolbar4'] = '';
</ins><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">- self::$mce_settings[ $editor_id ] = $mceInit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$mce_settings[ $editor_id ] = $mce_init;
</ins><span class="cx" style="display: block; padding: 0 10px"> } // End if self::$this_tinymce.
</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">@@ -1567,28 +1567,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function editor_js() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $tinymce_version;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tmce_on = ! empty( self::$mce_settings );
- $mceInit = '';
- $qtInit = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tmce_on = ! empty( self::$mce_settings );
+ $mce_init = '';
+ $qt_init = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tmce_on ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( self::$mce_settings as $editor_id => $init ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $options = self::_parse_init( $init );
- $mceInit .= "'$editor_id':{$options},";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options = self::_parse_init( $init );
+ $mce_init .= "'$editor_id':{$options},";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mceInit = '{' . trim( $mceInit, ',' ) . '}';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mce_init = '{' . trim( $mce_init, ',' ) . '}';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mceInit = '{}';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mce_init = '{}';
</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 ( ! empty( self::$qt_settings ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( self::$qt_settings as $editor_id => $init ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $options = self::_parse_init( $init );
- $qtInit .= "'$editor_id':{$options},";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options = self::_parse_init( $init );
+ $qt_init .= "'$editor_id':{$options},";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qtInit = '{' . trim( $qtInit, ',' ) . '}';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qt_init = '{' . trim( $qt_init, ',' ) . '}';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qtInit = '{}';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qt_init = '{}';
</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"> $ref = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1622,8 +1622,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">- mceInit: <?php echo $mceInit; ?>,
- qtInit: <?php echo $qtInit; ?>,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mceInit: <?php echo $mce_init; ?>,
+ qtInit: <?php echo $qt_init; ?>,
</ins><span class="cx" style="display: block; padding: 0 10px"> ref: <?php echo self::_parse_init( $ref ); ?>,
</span><span class="cx" style="display: block; padding: 0 10px"> load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span></span></pre>
</div>
</div>
</body>
</html>