<!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>[34022] trunk/src/wp-admin: Move ad hoc Options functions to `wp-admin/includes/options.php`:</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/34022">34022</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/34022","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-09-10 21:44:29 +0000 (Thu, 10 Sep 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'>Move ad hoc Options functions to `wp-admin/includes/options.php`:
* Move `options_discussion_add_js()` from `wp-admin/options-discussion.php`
* Move `options_general_add_js()` from `wp-admin/options-general.php`
* Move `options_permalink_add_js()` from `wp-admin/options-permalink.php`
* Move `options_reading_add_js()` from `wp-admin/options-reading.php`
* Move `options_reading_blog_charset()` from `wp-admin/options-reading.php`
See <a href="https://core.trac.wordpress.org/ticket/33813">#33813</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesadminphp">trunk/src/wp-admin/includes/admin.php</a></li>
<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpadminoptionsreadingphp">trunk/src/wp-admin/options-reading.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesoptionsphp">trunk/src/wp-admin/includes/options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesadminphp"></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/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin.php 2015-09-10 21:32:46 UTC (rev 34021)
+++ trunk/src/wp-admin/includes/admin.php 2015-09-10 21:44:29 UTC (rev 34022)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,6 +39,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** WordPress Misc Administration API */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once(ABSPATH . 'wp-admin/includes/misc.php');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** WordPress Options Administration API */
+require_once(ABSPATH . 'wp-admin/includes/options.php');
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** WordPress Plugin Administration API */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once(ABSPATH . 'wp-admin/includes/plugin.php');
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesoptionsphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-admin/includes/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/options.php (rev 0)
+++ trunk/src/wp-admin/includes/options.php 2015-09-10 21:44:29 UTC (rev 34022)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,141 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * WordPress Options Administration API.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 4.4.0
+ */
+
+/**
+ * Output JavaScript to toggle display of additional settings if avatars are disabled.
+ *
+ * @since 4.2.0
+ */
+function options_discussion_add_js() {
+?>
+ <script>
+ (function($){
+ var parent = $( '#show_avatars' ),
+ children = $( '.avatar-settings' );
+ parent.change(function(){
+ children.toggleClass( 'hide-if-js', ! this.checked );
+ });
+ })(jQuery);
+ </script>
+<?php
+}
+
+/**
+ * Display JavaScript on the page.
+ *
+ * @since 3.5.0
+ */
+function options_general_add_js() {
+?>
+<script type="text/javascript">
+ jQuery(document).ready(function($){
+ var $siteName = $( '#wp-admin-bar-site-name' ).children( 'a' ).first(),
+ homeURL = ( <?php echo wp_json_encode( get_home_url() ); ?> || '' ).replace( /^(https?:\/\/)?(www\.)?/, '' );
+
+ $( '#blogname' ).on( 'input', function() {
+ var title = $.trim( $( this ).val() ) || homeURL;
+
+ // Truncate to 40 characters.
+ if ( 40 < title.length ) {
+ title = title.substring( 0, 40 ) + '\u2026';
+ }
+
+ $siteName.text( title );
+ });
+
+ $("input[name='date_format']").click(function(){
+ if ( "date_format_custom_radio" != $(this).attr("id") )
+ $( "input[name='date_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).text() );
+ });
+ $("input[name='date_format_custom']").focus(function(){
+ $( '#date_format_custom_radio' ).prop( 'checked', true );
+ });
+
+ $("input[name='time_format']").click(function(){
+ if ( "time_format_custom_radio" != $(this).attr("id") )
+ $( "input[name='time_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).text() );
+ });
+ $("input[name='time_format_custom']").focus(function(){
+ $( '#time_format_custom_radio' ).prop( 'checked', true );
+ });
+ $("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
+ var format = $(this);
+ format.siblings( '.spinner' ).addClass( 'is-active' );
+ $.post(ajaxurl, {
+ action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
+ date : format.val()
+ }, function(d) { format.siblings( '.spinner' ).removeClass( 'is-active' ); format.siblings('.example').text(d); } );
+ });
+
+ var languageSelect = $( '#WPLANG' );
+ $( 'form' ).submit( function() {
+ // Don't show a spinner for English and installed languages,
+ // as there is nothing to download.
+ if ( ! languageSelect.find( 'option:selected' ).data( 'installed' ) ) {
+ $( '#submit', this ).after( '<span class="spinner language-install-spinner" />' );
+ }
+ });
+ });
+</script>
+<?php
+}
+
+/**
+ * Display JavaScript on the page.
+ *
+ * @since 3.5.0
+ */
+function options_permalink_add_js() {
+ ?>
+<script type="text/javascript">
+jQuery(document).ready(function() {
+ jQuery('.permalink-structure input:radio').change(function() {
+ if ( 'custom' == this.value )
+ return;
+ jQuery('#permalink_structure').val( this.value );
+ });
+ jQuery('#permalink_structure').focus(function() {
+ jQuery("#custom_selection").attr('checked', 'checked');
+ });
+});
+</script>
+<?php
+}
+
+/**
+ * Display JavaScript on the page.
+ *
+ * @since 3.5.0
+ */
+function options_reading_add_js() {
+?>
+<script type="text/javascript">
+ jQuery(document).ready(function($){
+ var section = $('#front-static-pages'),
+ staticPage = section.find('input:radio[value="page"]'),
+ selects = section.find('select'),
+ check_disabled = function(){
+ selects.prop( 'disabled', ! staticPage.prop('checked') );
+ };
+ check_disabled();
+ section.find('input:radio').change(check_disabled);
+ });
+</script>
+<?php
+}
+
+/**
+ * Render the blog charset setting.
+ *
+ * @since 3.5.0
+ */
+function options_reading_blog_charset() {
+ echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
+ echo '<p class="description">' . __( 'The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpadminoptionsdiscussionphp"></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/options-discussion.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-discussion.php 2015-09-10 21:32:46 UTC (rev 34021)
+++ trunk/src/wp-admin/options-discussion.php 2015-09-10 21:44:29 UTC (rev 34022)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,24 +14,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __('Discussion Settings');
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'options-general.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Output JavaScript to toggle display of additional settings if avatars are disabled.
- *
- * @since 4.2.0
- */
-function options_discussion_add_js() {
-?>
- <script>
- (function($){
- var parent = $( '#show_avatars' ),
- children = $( '.avatar-settings' );
- parent.change(function(){
- children.toggleClass( 'hide-if-js', ! this.checked );
- });
- })(jQuery);
- </script>
-<?php
-}
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_print_footer_scripts', 'options_discussion_add_js' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span></span></pre></div>
<a id="trunksrcwpadminoptionsgeneralphp"></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/options-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2015-09-10 21:32:46 UTC (rev 34021)
+++ trunk/src/wp-admin/options-general.php 2015-09-10 21:44:29 UTC (rev 34022)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,65 +20,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: date and time format for exact current time, mainly about timezones, see http://php.net/date */
</span><span class="cx" style="display: block; padding: 0 10px"> $timezone_format = _x('Y-m-d H:i:s', 'timezone date format');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Display JavaScript on the page.
- *
- * @since 3.5.0
- */
-function options_general_add_js() {
-?>
-<script type="text/javascript">
- jQuery(document).ready(function($){
- var $siteName = $( '#wp-admin-bar-site-name' ).children( 'a' ).first(),
- homeURL = ( <?php echo wp_json_encode( get_home_url() ); ?> || '' ).replace( /^(https?:\/\/)?(www\.)?/, '' );
-
- $( '#blogname' ).on( 'input', function() {
- var title = $.trim( $( this ).val() ) || homeURL;
-
- // Truncate to 40 characters.
- if ( 40 < title.length ) {
- title = title.substring( 0, 40 ) + '\u2026';
- }
-
- $siteName.text( title );
- });
-
- $("input[name='date_format']").click(function(){
- if ( "date_format_custom_radio" != $(this).attr("id") )
- $( "input[name='date_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).text() );
- });
- $("input[name='date_format_custom']").focus(function(){
- $( '#date_format_custom_radio' ).prop( 'checked', true );
- });
-
- $("input[name='time_format']").click(function(){
- if ( "time_format_custom_radio" != $(this).attr("id") )
- $( "input[name='time_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).text() );
- });
- $("input[name='time_format_custom']").focus(function(){
- $( '#time_format_custom_radio' ).prop( 'checked', true );
- });
- $("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
- var format = $(this);
- format.siblings( '.spinner' ).addClass( 'is-active' );
- $.post(ajaxurl, {
- action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
- date : format.val()
- }, function(d) { format.siblings( '.spinner' ).removeClass( 'is-active' ); format.siblings('.example').text(d); } );
- });
-
- var languageSelect = $( '#WPLANG' );
- $( 'form' ).submit( function() {
- // Don't show a spinner for English and installed languages,
- // as there is nothing to download.
- if ( ! languageSelect.find( 'option:selected' ).data( 'installed' ) ) {
- $( '#submit', this ).after( '<span class="spinner language-install-spinner" />' );
- }
- });
- });
-</script>
-<?php
-}
</del><span class="cx" style="display: block; padding: 0 10px"> add_action('admin_head', 'options_general_add_js');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></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/options-permalink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-permalink.php 2015-09-10 21:32:46 UTC (rev 34021)
+++ trunk/src/wp-admin/options-permalink.php 2015-09-10 21:44:29 UTC (rev 34022)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,27 +46,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</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">-/**
- * Display JavaScript on the page.
- *
- * @since 3.5.0
- */
-function options_permalink_add_js() {
- ?>
-<script type="text/javascript">
-jQuery(document).ready(function() {
- jQuery('.permalink-structure input:radio').change(function() {
- if ( 'custom' == this.value )
- return;
- jQuery('#permalink_structure').val( this.value );
- });
- jQuery('#permalink_structure').focus(function() {
- jQuery("#custom_selection").attr('checked', 'checked');
- });
-});
-</script>
-<?php
-}
</del><span class="cx" style="display: block; padding: 0 10px"> add_filter('admin_head', 'options_permalink_add_js');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $home_path = get_home_path();
</span></span></pre></div>
<a id="trunksrcwpadminoptionsreadingphp"></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/options-reading.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-reading.php 2015-09-10 21:32:46 UTC (rev 34021)
+++ trunk/src/wp-admin/options-reading.php 2015-09-10 21:44:29 UTC (rev 34022)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,39 +15,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Reading Settings' );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'options-general.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Display JavaScript on the page.
- *
- * @since 3.5.0
- */
-function options_reading_add_js() {
-?>
-<script type="text/javascript">
- jQuery(document).ready(function($){
- var section = $('#front-static-pages'),
- staticPage = section.find('input:radio[value="page"]'),
- selects = section.find('select'),
- check_disabled = function(){
- selects.prop( 'disabled', ! staticPage.prop('checked') );
- };
- check_disabled();
- section.find('input:radio').change(check_disabled);
- });
-</script>
-<?php
-}
</del><span class="cx" style="display: block; padding: 0 10px"> add_action('admin_head', 'options_reading_add_js');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Render the blog charset setting.
- *
- * @since 3.5.0
- */
-function options_reading_blog_charset() {
- echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
- echo '<p class="description">' . __( 'The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __('Overview'),
</span></span></pre>
</div>
</div>
</body>
</html>