<!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>[21856] trunk/wp-admin: Rename duplicately defined internal functions (add_js, display_header) for documentation purposes.</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, #logmsg > ol { margin-left: 0; 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/21856">21856</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-15 19:49:21 +0000 (Sat, 15 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename duplicately defined internal functions (add_js, display_header) for documentation purposes. props bpetty, fixes <a href="http://core.trac.wordpress.org/ticket/21564">#21564</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (21855 => 21856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2012-09-15 19:44:51 UTC (rev 21855)
+++ trunk/wp-admin/export.php 2012-09-15 19:49:21 UTC (rev 21856)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> require_once('./includes/export.php');
</span><span class="cx"> $title = __('Export');
</span><span class="cx">
</span><del>-function add_js() {
</del><ins>+function export_add_js() {
</ins><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-add_action( 'admin_head', 'add_js' );
</del><ins>+add_action( 'admin_head', 'export_add_js' );
</ins><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (21855 => 21856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2012-09-15 19:44:51 UTC (rev 21855)
+++ trunk/wp-admin/options-general.php 2012-09-15 19:49:21 UTC (rev 21856)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage General_Settings_Screen
</span><span class="cx"> */
</span><del>-function add_js() {
</del><ins>+function options_general_add_js() {
</ins><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-add_action('admin_head', 'add_js');
</del><ins>+add_action('admin_head', 'options_general_add_js');
</ins><span class="cx">
</span><span class="cx"> $options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
</span><span class="cx"> '<p>' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '</p>';
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (21855 => 21856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2012-09-15 19:44:51 UTC (rev 21855)
+++ trunk/wp-admin/options-permalink.php 2012-09-15 19:49:21 UTC (rev 21856)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Permalink_Settings_Screen
</span><span class="cx"> */
</span><del>-function add_js() {
</del><ins>+function options_permalink_add_js() {
</ins><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-add_filter('admin_head', 'add_js');
</del><ins>+add_filter('admin_head', 'options_permalink_add_js');
</ins><span class="cx">
</span><span class="cx"> include('./admin-header.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (21855 => 21856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2012-09-15 19:44:51 UTC (rev 21855)
+++ trunk/wp-admin/options-reading.php 2012-09-15 19:49:21 UTC (rev 21856)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Reading_Settings_Screen
</span><span class="cx"> */
</span><del>-function add_js() {
</del><ins>+function options_reading_add_js() {
</ins><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-add_action('admin_head', 'add_js');
</del><ins>+add_action('admin_head', 'options_reading_add_js');
</ins><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span></span></pre></div>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (21855 => 21856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2012-09-15 19:44:51 UTC (rev 21855)
+++ trunk/wp-admin/setup-config.php 2012-09-15 19:49:21 UTC (rev 21856)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Installer_WP_Config
</span><span class="cx"> */
</span><del>-function display_header() {
</del><ins>+function setup_config_display_header() {
</ins><span class="cx"> global $wp_version;
</span><span class="cx">
</span><span class="cx"> header( 'Content-Type: text/html; charset=utf-8' );
</span><span class="lines">@@ -101,11 +101,11 @@
</span><span class="cx"> <body<?php if ( is_rtl() ) echo ' class="rtl"'; ?>>
</span><span class="cx"> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png?ver=20120216" /></h1>
</span><span class="cx"> <?php
</span><del>-}//end function display_header();
</del><ins>+} // end function setup_config_display_header();
</ins><span class="cx">
</span><span class="cx"> switch($step) {
</span><span class="cx"> case 0:
</span><del>- display_header();
</del><ins>+ setup_config_display_header();
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 1:
</span><del>- display_header();
</del><ins>+ setup_config_display_header();
</ins><span class="cx"> ?>
</span><span class="cx"> <form method="post" action="setup-config.php?step=2">
</span><span class="cx"> <p><?php _e( "Below you should enter your database connection details. If you're not sure about these, contact your host." ); ?></p>
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> unset( $line );
</span><span class="cx">
</span><span class="cx"> if ( ! is_writable(ABSPATH) ) :
</span><del>- display_header();
</del><ins>+ setup_config_display_header();
</ins><span class="cx"> ?>
</span><span class="cx"> <p><?php _e( "Sorry, but I can't write the <code>wp-config.php</code> file." ); ?></p>
</span><span class="cx"> <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> }
</span><span class="cx"> fclose($handle);
</span><span class="cx"> chmod(ABSPATH . 'wp-config.php', 0666);
</span><del>- display_header();
</del><ins>+ setup_config_display_header();
</ins><span class="cx"> ?>
</span><span class="cx"> <p><?php _e( "All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;" ); ?></p>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>