Changeset 12977
- Timestamp:
- 02/05/2010 09:40:22 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/functions.php
r12973 r12977 3072 3072 * 3073 3073 * @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. 3075 3075 * @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do 3076 3076 * trigger or false to not trigger error. … … 3079 3079 * @param string $version The version of WordPress that deprecated the file 3080 3080 * @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 */ 3083 function _deprecated_file( $file, $version, $replacement = null, $message = '' ) { 3084 3085 do_action( 'deprecated_file_included', $file, $replacement, $version, $message ); 3085 3086 3086 3087 // Allow plugin to filter the output error trigger 3087 3088 if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) { 3089 $message = empty( $message ) ? '' : ' ' . $message; 3088 3090 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 ); 3090 3092 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 ); 3092 3094 } 3093 3095 } -
trunk/wp-includes/ms-files.php
r12936 r12977 1 1 <?php 2 2 /** 3 * Load mulitsite uploaded media3 * Multisite upload handler. 4 4 * 5 5 * @since 3.0.0 … … 9 9 */ 10 10 11 define( 'SHORTINIT', true ); 12 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); 11 if ( ! defined( 'SHORTINIT' ) ) { 12 define( 'SHORTINIT', true ); 13 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); 14 } 15 13 16 ms_default_constants( 'ms-files' ); 14 17
Note: See TracChangeset
for help on using the changeset viewer.