WordPress.org

Make WordPress Core

Changeset 21856


Ignore:
Timestamp:
09/15/12 19:49:21 (19 months 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/export.php

    r21749 r21856  
    1717$title = __('Export'); 
    1818 
    19 function add_js() { 
     19function export_add_js() { 
    2020?> 
    2121<script type="text/javascript"> 
     
    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( 
  • trunk/wp-admin/options-general.php

    r20605 r21856  
    2424 * @subpackage General_Settings_Screen 
    2525 */ 
    26 function add_js() { 
     26function options_general_add_js() { 
    2727?> 
    2828<script type="text/javascript"> 
     
    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>' . 
  • trunk/wp-admin/options-permalink.php

    r20023 r21856  
    5353 * @subpackage Permalink_Settings_Screen 
    5454 */ 
    55 function add_js() { 
     55function options_permalink_add_js() { 
    5656    ?> 
    5757<script type="text/javascript"> 
     
    7171<?php 
    7272} 
    73 add_filter('admin_head', 'add_js'); 
     73add_filter('admin_head', 'options_permalink_add_js'); 
    7474 
    7575include('./admin-header.php'); 
  • trunk/wp-admin/options-reading.php

    r21851 r21856  
    2222 * @subpackage Reading_Settings_Screen 
    2323 */ 
    24 function add_js() { 
     24function options_reading_add_js() { 
    2525?> 
    2626<script type="text/javascript"> 
     
    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( 
  • trunk/wp-admin/setup-config.php

    r21716 r21856  
    8686 * @subpackage Installer_WP_Config 
    8787 */ 
    88 function display_header() { 
     88function setup_config_display_header() { 
    8989    global $wp_version; 
    9090 
     
    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 
     
    125125 
    126126    case 1: 
    127         display_header(); 
     127        setup_config_display_header(); 
    128128    ?> 
    129129<form method="post" action="setup-config.php?step=2"> 
     
    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> 
     
    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> 
Note: See TracChangeset for help on using the changeset viewer.