Ticket #21564: 21564.2.patch

wp-admin/export.php

@@ -16 +16 @@
 require_once('./includes/export.php');
 $title = __('Export');
 
-function add_js() {
+function export_add_js() {
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -36 +36 @@
 </script>
 <?php
 }
-add_action( 'admin_head', 'add_js' );
+add_action( 'admin_head', 'export_add_js' );
 
 get_current_screen()->add_help_tab( array(
         'id'      => 'overview',

wp-admin/options-general.php

@@ -23 +23 @@
  * @package WordPress
  * @subpackage General_Settings_Screen
  */
-function add_js() {
+function options_general_add_js() {
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -56 +56 @@
 </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>';

wp-admin/options-permalink.php

@@ -52 +52 @@
  * @package WordPress
  * @subpackage Permalink_Settings_Screen
  */
-function add_js() {
+function options_permalink_add_js() {
         ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -70 +70 @@
 </script>
 <?php
 }
-add_filter('admin_head', 'add_js');
+add_filter('admin_head', 'options_permalink_add_js');
 
 include('./admin-header.php');
 

wp-admin/options-reading.php

@@ -21 +21 @@
  * @package WordPress
  * @subpackage Reading_Settings_Screen
  */
-function add_js() {
+function options_reading_add_js() {
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -39 +39 @@
 </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',

wp-admin/setup-config.php

@@ -85 +85 @@
  * @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 +101 @@
 <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 +124 @@
         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 +254 @@
         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 +273 @@
                 }
                 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>