From b523c3d597af92e058d639fb1f8650dcabcb52f0 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Sat, 15 Sep 2012 19:49:21 +0000
Subject: [PATCH] Rename duplicately defined internal functions (add_js,
 display_header) for documentation purposes. props bpetty, fixes #21564.

git-svn-id: http://core.svn.wordpress.org/trunk@21856 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/export.php            |  4 ++--
 wp-admin/options-general.php   |  4 ++--
 wp-admin/options-permalink.php |  4 ++--
 wp-admin/options-reading.php   |  4 ++--
 wp-admin/setup-config.php      | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/wp-admin/export.php b/wp-admin/export.php
index eaf76fc751..236007bf38 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -16,7 +16,7 @@ if ( !current_user_can('export') )
 require_once('./includes/export.php');
 $title = __('Export');
 
-function add_js() {
+function export_add_js() {
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -36,7 +36,7 @@ function add_js() {
 </script>
 <?php
 }
-add_action( 'admin_head', 'add_js' );
+add_action( 'admin_head', 'export_add_js' );
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index d8a8b805ff..abfc272ac0 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -23,7 +23,7 @@ $timezone_format = _x('Y-m-d G:i:s', 'timezone date format');
  * @package WordPress
  * @subpackage General_Settings_Screen
  */
-function add_js() {
+function options_general_add_js() {
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -56,7 +56,7 @@ function add_js() {
 </script>
 <?php
 }
-add_action('admin_head', 'add_js');
+add_action('admin_head', 'options_general_add_js');
 
 $options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
 	'<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>';
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 9ccb62f263..d4adae98fc 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -52,7 +52,7 @@ get_current_screen()->set_help_sidebar(
  * @package WordPress
  * @subpackage Permalink_Settings_Screen
  */
-function add_js() {
+function options_permalink_add_js() {
 	?>
 <script type="text/javascript">
 //<![CDATA[
@@ -70,7 +70,7 @@ jQuery(document).ready(function() {
 </script>
 <?php
 }
-add_filter('admin_head', 'add_js');
+add_filter('admin_head', 'options_permalink_add_js');
 
 include('./admin-header.php');
 
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 1c83fbf589..34c48f0f76 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -21,7 +21,7 @@ $parent_file = 'options-general.php';
  * @package WordPress
  * @subpackage Reading_Settings_Screen
  */
-function add_js() {
+function options_reading_add_js() {
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -39,7 +39,7 @@ function add_js() {
 </script>
 <?php
 }
-add_action('admin_head', 'add_js');
+add_action('admin_head', 'options_reading_add_js');
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 5bf19ad1ce..b533902d43 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -85,7 +85,7 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
  * @package WordPress
  * @subpackage Installer_WP_Config
  */
-function display_header() {
+function setup_config_display_header() {
 	global $wp_version;
 
 	header( 'Content-Type: text/html; charset=utf-8' );
@@ -101,11 +101,11 @@ function display_header() {
 <body<?php if ( is_rtl() ) echo ' class="rtl"'; ?>>
 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png?ver=20120216" /></h1>
 <?php
-}//end function display_header();
+} // end function setup_config_display_header();
 
 switch($step) {
 	case 0:
-		display_header();
+		setup_config_display_header();
 ?>
 
 <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>
@@ -124,7 +124,7 @@ switch($step) {
 	break;
 
 	case 1:
-		display_header();
+		setup_config_display_header();
 	?>
 <form method="post" action="setup-config.php?step=2">
 	<p><?php _e( "Below you should enter your database connection details. If you're not sure about these, contact your host." ); ?></p>
@@ -254,7 +254,7 @@ switch($step) {
 	unset( $line );
 
 	if ( ! is_writable(ABSPATH) ) :
-		display_header();
+		setup_config_display_header();
 ?>
 <p><?php _e( "Sorry, but I can't write the <code>wp-config.php</code> file." ); ?></p>
 <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
@@ -273,7 +273,7 @@ switch($step) {
 		}
 		fclose($handle);
 		chmod(ABSPATH . 'wp-config.php', 0666);
-		display_header();
+		setup_config_display_header();
 ?>
 <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>