Changeset 21856

Timestamp:

09/15/2012 07:49:21 PM (12 years ago)

Author:

nacin

Message:

Rename duplicately defined internal functions (add_js, display_header) for documentation purposes. props bpetty, fixes #21564.

Location:

trunk/wp-admin

Files:

• export.php (modified) (2 diffs)
• options-general.php (modified) (2 diffs)
• options-permalink.php (modified) (2 diffs)
• options-reading.php (modified) (2 diffs)
• setup-config.php (modified) (5 diffs)

trunk/wp-admin/export.php

@@ -17 +17 @@
 $title = __('Export');
 
-function add_js() {
+function export_add_js() {
 ?>
 <script type="text/javascript">
@@ -37 +37 @@
 <?php
 }
-add_action( 'admin_head', 'add_js' );
+add_action( 'admin_head', 'export_add_js' );
 
 get_current_screen()->add_help_tab( array(

trunk/wp-admin/options-general.php

@@ -24 +24 @@
  * @subpackage General_Settings_Screen
  */
-function add_js() {
+function options_general_add_js() {
 ?>
 <script type="text/javascript">
@@ -57 +57 @@
 <?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>' .

trunk/wp-admin/options-permalink.php

@@ -53 +53 @@
  * @subpackage Permalink_Settings_Screen
  */
-function add_js() {
+function options_permalink_add_js() {
     ?>
 <script type="text/javascript">
@@ -71 +71 @@
 <?php
 }
-add_filter('admin_head', 'add_js');
+add_filter('admin_head', 'options_permalink_add_js');
 
 include('./admin-header.php');

trunk/wp-admin/options-reading.php

@@ -22 +22 @@
  * @subpackage Reading_Settings_Screen
  */
-function add_js() {
+function options_reading_add_js() {
 ?>
 <script type="text/javascript">
@@ -40 +40 @@
 <?php
 }
-add_action('admin_head', 'add_js');
+add_action('admin_head', 'options_reading_add_js');
 
 get_current_screen()->add_help_tab( array(

trunk/wp-admin/setup-config.php

@@ -86 +86 @@
  * @subpackage Installer_WP_Config
  */
-function display_header() {
+function setup_config_display_header() {
     global $wp_version;
 
@@ -102 +102 @@
 <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();
 ?>
 
@@ -125 +125 @@
 
     case 1:
-        display_header();
+        setup_config_display_header();
     ?>
 <form method="post" action="setup-config.php?step=2">
@@ -255 +255 @@
 
     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>
@@ -274 +274 @@
         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>