Make WordPress Core

Changeset 28906


Ignore:
Timestamp:
06/29/2014 10:20:26 PM (10 years ago)
Author:
wonderboymusic
Message:

Admin screens should use the WPINC constant

Props wojtek.szkutnik
See #14157.

Location:
trunk/src/wp-admin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/install.php

    r28896 r28906  
    4040
    4141/** Load wpdb */
    42 require_once( ABSPATH . 'wp-includes/wp-db.php' );
     42require_once( ABSPATH . WPINC . '/wp-db.php' );
    4343
    4444$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
  • trunk/src/wp-admin/load-styles.php

    r27253 r28906  
    9393}
    9494
    95 require(ABSPATH . '/wp-includes/script-loader.php');
    96 require(ABSPATH . '/wp-includes/version.php');
     95require( ABSPATH . WPINC . '/script-loader.php' );
     96require( ABSPATH . WPINC . '/version.php' );
    9797
    9898$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] );
     
    125125    $content = get_file( $path ) . "\n";
    126126
    127     if ( strpos( $style->src, '/wp-includes/css/' ) === 0 ) {
    128         $content = str_replace( '../images/', '../wp-includes/images/', $content );
    129         $content = str_replace( '../js/tinymce/', '../wp-includes/js/tinymce/', $content );
    130         $content = str_replace( '../fonts/', '../wp-includes/fonts/', $content );
     127    if ( strpos( $style->src, '/' . WPINC . '/css/' ) === 0 ) {
     128        $content = str_replace( '../images/', '../' . WPINC . '/images/', $content );
     129        $content = str_replace( '../js/tinymce/', '../' . WPINC . '/js/tinymce/', $content );
     130        $content = str_replace( '../fonts/', '../' . WPINC . '/fonts/', $content );
    131131        $out .= $content;
    132132    } else {
  • trunk/src/wp-admin/network.php

    r28712 r28906  
    440440                <rule name="WordPress Rule for Files" stopProcessing="true">
    441441                    <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
    442                     <action type="Rewrite" url="' . $iis_rewrite_base . 'wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
     442                    <action type="Rewrite" url="' . $iis_rewrite_base . WPINC . '/ms-files.php?file={R:1}" appendQueryString="false" />
    443443                </rule>';
    444444                }
     
    490490        if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
    491491            $ms_files_rewriting = "\n# uploaded files\nRewriteRule ^";
    492             $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}wp-includes/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
     492            $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
    493493        }
    494494
  • trunk/src/wp-admin/setup-config.php

    r28896 r28906  
    100100<title><?php _e( 'WordPress &rsaquo; Setup Configuration File' ); ?></title>
    101101<link rel="stylesheet" href="css/install.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
    102 <link rel="stylesheet" href="../wp-includes/css/buttons.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
     102<link rel="stylesheet" href="../<?php echo WPINC ?>/css/buttons.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
    103103
    104104</head>
Note: See TracChangeset for help on using the changeset viewer.