Make WordPress Core


Ignore:
Timestamp:
08/30/2006 09:46:31 PM (18 years ago)
Author:
ryan
Message:

Use get_option instead of get_settings. Just 'cause.

File:
1 edited

Legend:

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

    r4133 r4144  
    9090
    9191    // Add 'www.' if it is absent and should be there
    92     if ( false !== strpos(get_settings('home'), '://www.') && false === strpos($url, '://www.') )
     92    if ( false !== strpos(get_option('home'), '://www.') && false === strpos($url, '://www.') )
    9393        $url = str_replace('://', '://www.', $url);
    9494
    9595    // Strip 'www.' if it is present and shouldn't be
    96     if ( false === strpos(get_settings('home'), '://www.') )
     96    if ( false === strpos(get_option('home'), '://www.') )
    9797        $url = str_replace('://www.', '://', $url);
    9898
     
    101101        $url = str_replace('index.php/', '', $url);
    102102
    103     if ( false !== strpos($url, get_settings('home')) ) {
     103    if ( false !== strpos($url, get_option('home')) ) {
    104104        // Chop off http://domain.com
    105         $url = str_replace(get_settings('home'), '', $url);
     105        $url = str_replace(get_option('home'), '', $url);
    106106    } else {
    107107        // Chop off /path/to/blog
    108         $home_path = parse_url(get_settings('home'));
     108        $home_path = parse_url(get_option('home'));
    109109        $home_path = $home_path['path'];
    110110        $url = str_replace($home_path, '', $url);
     
    260260
    261261    function page_rewrite_rules() {
    262         $uris = get_settings('page_uris');
    263         $attachment_uris = get_settings('page_attachment_uris');
     262        $uris = get_option('page_uris');
     263        $attachment_uris = get_option('page_attachment_uris');
    264264
    265265        $rewrite_rules = array();
     
    758758        }
    759759
    760         $site_root = parse_url(get_settings('siteurl'));
     760        $site_root = parse_url(get_option('siteurl'));
    761761        $site_root = trailingslashit($site_root['path']);
    762762
    763         $home_root = parse_url(get_settings('home'));
     763        $home_root = parse_url(get_option('home'));
    764764        $home_root = trailingslashit($home_root['path']);
    765765   
     
    854854    function init() {
    855855        $this->extra_rules = $this->non_wp_rules = $this->endpoints = array();
    856         $this->permalink_structure = get_settings('permalink_structure');
     856        $this->permalink_structure = get_option('permalink_structure');
    857857        $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
    858858        $this->root = '';
     
    860860            $this->root = $this->index . '/';
    861861        }
    862         $this->category_base = get_settings('category_base');
     862        $this->category_base = get_option('category_base');
    863863        unset($this->category_structure);
    864864        unset($this->author_structure);
Note: See TracChangeset for help on using the changeset viewer.