WordPress.org

Make WordPress Core

Ticket #21564: 21564.2.patch

File 21564.2.patch, 4.4 KB (added by SergeyBiryukov, 19 months ago)
  • wp-admin/export.php

     
    1616require_once('./includes/export.php'); 
    1717$title = __('Export'); 
    1818 
    19 function add_js() { 
     19function export_add_js() { 
    2020?> 
    2121<script type="text/javascript"> 
    2222//<![CDATA[ 
     
    3636</script> 
    3737<?php 
    3838} 
    39 add_action( 'admin_head', 'add_js' ); 
     39add_action( 'admin_head', 'export_add_js' ); 
    4040 
    4141get_current_screen()->add_help_tab( array( 
    4242        'id'      => 'overview', 
  • wp-admin/options-general.php

     
    2323 * @package WordPress 
    2424 * @subpackage General_Settings_Screen 
    2525 */ 
    26 function add_js() { 
     26function options_general_add_js() { 
    2727?> 
    2828<script type="text/javascript"> 
    2929//<![CDATA[ 
     
    5656</script> 
    5757<?php 
    5858} 
    59 add_action('admin_head', 'add_js'); 
     59add_action('admin_head', 'options_general_add_js'); 
    6060 
    6161$options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' . 
    6262        '<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

     
    5252 * @package WordPress 
    5353 * @subpackage Permalink_Settings_Screen 
    5454 */ 
    55 function add_js() { 
     55function options_permalink_add_js() { 
    5656        ?> 
    5757<script type="text/javascript"> 
    5858//<![CDATA[ 
     
    7070</script> 
    7171<?php 
    7272} 
    73 add_filter('admin_head', 'add_js'); 
     73add_filter('admin_head', 'options_permalink_add_js'); 
    7474 
    7575include('./admin-header.php'); 
    7676 
  • wp-admin/options-reading.php

     
    2121 * @package WordPress 
    2222 * @subpackage Reading_Settings_Screen 
    2323 */ 
    24 function add_js() { 
     24function options_reading_add_js() { 
    2525?> 
    2626<script type="text/javascript"> 
    2727//<![CDATA[ 
     
    3939</script> 
    4040<?php 
    4141} 
    42 add_action('admin_head', 'add_js'); 
     42add_action('admin_head', 'options_reading_add_js'); 
    4343 
    4444get_current_screen()->add_help_tab( array( 
    4545        'id'      => 'overview', 
  • wp-admin/setup-config.php

     
    8585 * @package WordPress 
    8686 * @subpackage Installer_WP_Config 
    8787 */ 
    88 function display_header() { 
     88function setup_config_display_header() { 
    8989        global $wp_version; 
    9090 
    9191        header( 'Content-Type: text/html; charset=utf-8' ); 
     
    101101<body<?php if ( is_rtl() ) echo ' class="rtl"'; ?>> 
    102102<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png?ver=20120216" /></h1> 
    103103<?php 
    104 }//end function display_header(); 
     104} // end function setup_config_display_header(); 
    105105 
    106106switch($step) { 
    107107        case 0: 
    108                 display_header(); 
     108                setup_config_display_header(); 
    109109?> 
    110110 
    111111<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> 
     
    124124        break; 
    125125 
    126126        case 1: 
    127                 display_header(); 
     127                setup_config_display_header(); 
    128128        ?> 
    129129<form method="post" action="setup-config.php?step=2"> 
    130130        <p><?php _e( "Below you should enter your database connection details. If you're not sure about these, contact your host." ); ?></p> 
     
    254254        unset( $line ); 
    255255 
    256256        if ( ! is_writable(ABSPATH) ) : 
    257                 display_header(); 
     257                setup_config_display_header(); 
    258258?> 
    259259<p><?php _e( "Sorry, but I can't write the <code>wp-config.php</code> file." ); ?></p> 
    260260<p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p> 
     
    273273                } 
    274274                fclose($handle); 
    275275                chmod(ABSPATH . 'wp-config.php', 0666); 
    276                 display_header(); 
     276                setup_config_display_header(); 
    277277?> 
    278278<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> 
    279279