WordPress.org
Get WordPress

Make WordPress Core

Changeset 1997


Ignore:
Timestamp:
12/24/2004 01:34:47 AM (20 years ago)
Author:
saxmatt
Message:

Cleaning up blogfilename.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/admin-functions.php

    r1995 r1997  
    795795
    796796function get_real_file_to_edit($file) {
    797     if ('index.php' == $file || get_settings('blogfilename') == $file ||
     797    if ('index.php' == $file ||
    798798             '.htaccess' == $file) {
    799799        $real_file = get_home_path() . $file;

  • trunk/wp-admin/admin-header.php

    r1935 r1997  
    8686
    8787<div id="wphead">
    88 <h1><?php echo wptexturize(get_settings(('blogname'))); ?> <span>(<a href="<?php echo get_settings('home') . '/' . get_settings('blogfilename'); ?>"><?php _e('View site') ?> &raquo;</a>)</span></h1>
     88<h1><?php echo wptexturize(get_settings(('blogname'))); ?> <span>(<a href="<?php echo get_settings('home') . '/'; ?>"><?php _e('View site') ?> &raquo;</a>)</span></h1>
    8989</div>
    9090

  • trunk/wp-admin/upgrade-schema.php

    r1975 r1997  
    155155    $guessurl = preg_replace('|/wp-admin/.*|i', '', 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
    156156    add_option('siteurl', $guessurl, 'WordPress web address');
    157     add_option('blogfilename', '', 'Default file for blog');
    158157    add_option('blogname', 'My Weblog', 'Blog title');
    159158    add_option('blogdescription', 'Just another WordPress weblog', 'Short tagline');

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

    r1996 r1997  
    129129   
    130130    if (empty($link)) {
    131         $file = get_settings('home') . '/' . get_settings('blogfilename');
     131        $file = get_settings('home') . '/';
    132132        $link = $file.$querystring_start.'author'.$querystring_equal.$auth_ID;
    133133    } else {
    … …  
    171171
    172172function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {
    173     global $wpdb, $blogfilename;
     173    global $wpdb;
    174174
    175175    $query = "SELECT ID, user_nickname, user_firstname, user_lastname, user_nicename from $wpdb->users " . ($exclude_admin ? "WHERE user_nickname <> 'admin' " : '') . "ORDER BY user_nickname";

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

    r1940 r1997  
    3131   
    3232    if (empty($catlink)) {
    33         $file = get_settings('home') . '/' . get_settings('blogfilename');
     33        $file = get_settings('home') . '/';
    3434        $catlink = $file.$querystring_start.'cat'.$querystring_equal.$cat_ID;
    3535    } else {
    … …  
    214214    global $wpdb;
    215215    global $querystring_start, $querystring_equal, $querystring_separator;
    216     if (($file == 'blah') || ($file == '')) $file = get_settings('home') . '/' . get_settings('blogfilename');
     216    if (($file == 'blah') || ($file == '')) $file = get_settings('home') . '/';
    217217    if (!$selected) $selected=$cat;
    218218    $sort_column = 'cat_'.$sort_column;
    … …  
    287287    // Optiondates now works
    288288    if ('' == $file) {
    289         $file = get_settings('home') . '/' . get_settings('blogfilename');
     289        $file = get_settings('home') . '/';
    290290    }
    291291

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

    r1940 r1997  
    275275
    276276    // archive link url
    277     $archive_link_m = get_settings('siteurl').'/'.get_settings('blogfilename').$querystring_start.'m'.$querystring_equal;    # monthly archive;
    278     $archive_link_w = get_settings('siteurl').'/'.get_settings('blogfilename').$querystring_start.'w'.$querystring_equal;    # weekly archive;
    279     $archive_link_p = get_settings('siteurl').'/'.get_settings('blogfilename').$querystring_start.'p'.$querystring_equal;    # post-by-post archive;
     277    $archive_link_m = get_settings('siteurl').'/'.$querystring_start.'m'.$querystring_equal;    # monthly archive;
     278    $archive_link_w = get_settings('siteurl').'/'.$querystring_start.'w'.$querystring_equal;    # weekly archive;
     279    $archive_link_p = get_settings('siteurl').'/'.$querystring_start.'p'.$querystring_equal;    # post-by-post archive;
    280280
    281281    // over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
    … …  
    337337                    $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
    338338                    $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
    339                     $url  = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('home'), get_settings('blogfilename'), $querystring_start,
     339                    $url  = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('home'), '', $querystring_start,
    340340                                    $querystring_equal, $arc_year, $querystring_separator,
    341341                                    $querystring_equal, $arcresult->week);

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

    r1908 r1997  
    7979        return get_settings('home') . str_replace($rewritecode, $rewritereplace, $permalink);
    8080    } else { // if they're not using the fancy permalink option
    81         $permalink = get_settings('home') . '/' . get_settings('blogfilename') . '?p=' . $idpost->ID;
     81        $permalink = get_settings('home') . '/?p=' . $idpost->ID;
    8282        return $permalink;
    8383    }
    … …  
    114114        return get_settings('home') . trailingslashit($yearlink);
    115115    } else {
    116         return get_settings('home') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year;
     116        return get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year;
    117117    }
    118118}
    … …  
    128128        return get_settings('home') . trailingslashit($monthlink);
    129129    } else {
    130         return get_settings('home') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2);
     130        return get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2);
    131131    }
    132132}
    … …  
    145145        return get_settings('home') . trailingslashit($daylink);
    146146    } else {
    147         return get_settings('home') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2);
     147        return get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2);
    148148    }
    149149}

  • trunk/wp-includes/vars.php

    r1994 r1997  
    1414    $pagenow = $pagenow[0];
    1515    if (($querystring_start == '/') && ($pagenow != 'post.php')) {
    16         $pagenow = get_settings('siteurl') . '/' . get_settings('blogfilename');
     16        $pagenow = get_settings('siteurl') . '/';
    1717    }
    1818} else {

  • trunk/wp-register.php

    r1971 r1997  
    131131    <h2><?php _e('Registration Disabled') ?></h2>
    132132    <p><?php _e('User registration is currently not allowed.') ?><br />
    133     <a href="<?php echo get_settings('home') .'/'. get_settings('blogfilename'); ?>" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a>
     133    <a href="<?php echo get_settings('home') . '/'; ?>" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a>
    134134    </p>
    135135</div>

  • trunk/xmlrpc.php

    r1964 r1997  
    150150      $struct = array(
    151151        'isAdmin'  => $is_admin,
    152         'url'      => get_settings('home') .'/'.get_settings('blogfilename'),
     152        'url'      => get_settings('home') . '/',
    153153        'blogid'   => '1',
    154154        'blogName' => get_settings('blogname')
    … …  
    282282
    283283      /* warning: here we make the assumption that the weblog's URI is on the same server */
    284       $filename = get_settings('home').'/'.get_settings('blogfilename');
     284      $filename = get_settings('home') . '/';
    285285      $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
    286286
    … …  
    316316
    317317      /* warning: here we make the assumption that the weblog's URI is on the same server */
    318       $filename = get_settings('home').'/'.get_settings('blogfilename');
     318      $filename = get_settings('home') . '/';
    319319      $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
    320320
Note: See TracChangeset for help on using the changeset viewer.