WordPress.org

Make WordPress Core

Changeset 12977


Ignore:
Timestamp:
02/05/10 21:40:22 (4 years ago)
Author:
wpmuguru
Message:

restore shell wp-content/blogs.php & add deprecated warnings, props nacin, see #11742

Location:
trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/functions.php

    r12973 r12977  
    30723072 * 
    30733073 * @uses do_action() Calls 'deprecated_file_included' and passes the file name, what to use instead, 
    3074  *   and the version in which the file was deprecated. 
     3074 *   the version in which the file was deprecated, and any message regarding the change. 
    30753075 * @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do 
    30763076 *   trigger or false to not trigger error. 
     
    30793079 * @param string $version The version of WordPress that deprecated the file 
    30803080 * @param string $replacement Optional. The file that should have been included based on ABSPATH 
    3081  */ 
    3082 function _deprecated_file( $file, $version, $replacement = null ) { 
    3083  
    3084     do_action( 'deprecated_file_included', $file, $replacement, $version ); 
     3081 * @param string $message Optional. A message regarding the change 
     3082 */ 
     3083function _deprecated_file( $file, $version, $replacement = null, $message = '' ) { 
     3084 
     3085    do_action( 'deprecated_file_included', $file, $replacement, $version, $message ); 
    30853086 
    30863087    // Allow plugin to filter the output error trigger 
    30873088    if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) { 
     3089        $message = empty( $message ) ? '' : ' ' . $message; 
    30883090        if ( ! is_null( $replacement ) ) 
    3089             trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) ); 
     3091            trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message ); 
    30903092        else 
    3091             trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) ); 
     3093            trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message ); 
    30923094    } 
    30933095} 
  • trunk/wp-includes/ms-files.php

    r12936 r12977  
    11<?php 
    22/** 
    3  * Load mulitsite uploaded media 
     3 * Multisite upload handler. 
    44 * 
    55 * @since 3.0.0 
     
    99 */ 
    1010 
    11 define( 'SHORTINIT', true ); 
    12 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); 
     11if ( ! defined( 'SHORTINIT' ) ) { 
     12    define( 'SHORTINIT', true ); 
     13    require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); 
     14} 
     15 
    1316ms_default_constants( 'ms-files' ); 
    1417 
Note: See TracChangeset for help on using the changeset viewer.