WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
01/02/2005 02:47:45 AM (21 years ago)
Author:
rboren
Message:

Relocate default theme to themes/default. Remove special casing of default theme. Do not look directly in wp-content/ for default theme files. Simplify, simplify.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-includes/template-functions-general.php

    r2023 r2032  
    77        load_template( TEMPLATEPATH . '/header.php');
    88    else
    9         load_template( ABSPATH . 'wp-includes/wp-header.php');
     9        load_template( ABSPATH . 'wp-content/themes/default/header.php');
    1010}
    1111
    … …  
    1414        load_template( TEMPLATEPATH . '/footer.php');
    1515    else
    16         load_template( ABSPATH . 'wp-includes/wp-footer.php');
     16        load_template( ABSPATH . 'wp-content/themes/default/footer.php');
    1717}
    1818
    … …  
    2121        load_template( TEMPLATEPATH . '/sidebar.php');
    2222    else
    23         load_template( ABSPATH . 'wp-includes/wp-sidebar.php');
     23        load_template( ABSPATH . 'wp-content/themes/default/sidebar.php');
    2424}
    2525
    … …  
    106106    case 'stylesheet_url':
    107107        $output = get_stylesheet();
    108         if (empty($output) || $output == 'default') {
    109             $output = get_settings('siteurl') . "/wp-includes/wp-layout.css";
    110         } else {
    111             $output = get_settings('siteurl') . "/wp-content/themes/$output/style.css";
    112         }
     108        $output = get_settings('siteurl') . "/wp-content/themes/$output/style.css";
    113109        break;
    114110    case 'stylesheet_directory':
    115111        $output = get_stylesheet();
    116         if (empty($output) || $output == 'default') {
    117             $output = get_settings('siteurl');
    118         } else {
    119             $output = get_settings('siteurl') . "/wp-content/themes/$output";
    120         }
     112        $output = get_settings('siteurl') . "/wp-content/themes/$output";
    121113        break;
    122114    case 'template_directory':
    123115    case 'template_url':
    124116        $output = get_template();
    125         if (empty($output) || $output == 'default') {
    126             $output = get_settings('siteurl');
    127         } else {
    128             $output = get_settings('siteurl') . "/wp-content/themes/$output";
    129         }
     117        $output = get_settings('siteurl') . "/wp-content/themes/$output";
    130118        break;
    131119    case 'admin_email':
Note: See TracChangeset for help on using the changeset viewer.