WordPress.org
Get WordPress

Make WordPress Core

Changeset 4983


Ignore:
Timestamp:
03/07/2007 03:05:41 AM (20 years ago)
Author:
ryan
Message:

Standardize on 'url' for fetching the blog's url. Props rob1n. fixes #3623

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/themes.php

    r4495 r4983  
    2727<div id="message1" class="updated fade"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
    2828<?php elseif ( isset($_GET['activated']) ) : ?>
    29 <div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site &raquo;</a>'), get_bloginfo('home') . '/'); ?></p></div>
     29<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site &raquo;</a>'), get_bloginfo('url') . '/'); ?></p></div>
    3030<?php endif; ?>
    3131

  • trunk/wp-content/themes/default/searchform.php

    r4171 r4983  
    1 <form method="get" id="searchform" action="<?php bloginfo('home'); ?>/">
     1<form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
    22<div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
    33<input type="submit" id="searchsubmit" value="Search" />

  • trunk/wp-content/themes/default/sidebar.php

    r4707 r4983  
    1818
    1919                        <?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
    20                         <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
     20                        <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
    2121                        for the day <?php the_time('l, F jS, Y'); ?>.</p>
    2222
    2323                        <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
    24                         <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
     24                        <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
    2525                        for <?php the_time('F, Y'); ?>.</p>
    2626
    2727                        <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
    28                         <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
     28                        <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
    2929                        for the year <?php the_time('Y'); ?>.</p>
    3030
    3131                        <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
    32                         <p>You have searched the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
     32                        <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
    3333                        for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
    3434
    3535                        <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
    36                         <p>You are currently browsing the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
     36                        <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
    3737
    3838                        <?php } ?>

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

    r4976 r4983  
    6161function bloginfo($show='') {
    6262        $info = get_bloginfo($show);
    63         if (!strstr($show, 'url') && //don't filter URLs
    64                 !strstr($show, 'directory') &&
    65                 !strstr($show, 'home')) {
     63       
     64        // Don't filter URL's.
     65        if (strpos($show, 'url') === false ||
     66                strpos($show, 'directory') === false ||
     67                strpos($show, 'home') === false) {
    6668                $info = apply_filters('bloginfo', $info, $show);
    6769                $info = convert_chars($info);
    … …  
    7375}
    7476
    75 
     77/**
     78 * Note: some of these values are DEPRECATED. Meaning they could be
     79 * taken out at any time and shouldn't be relied upon. Options
     80 * without "// DEPRECATED" are the preferred and recommended ways
     81 * to get the information.
     82 */
    7683function get_bloginfo($show='') {
    7784
    7885        switch($show) {
    7986                case 'url' :
    80                 case 'home' :
    81                 case 'siteurl' :
     87                case 'home' : // DEPRECATED
     88                case 'siteurl' : // DEPRECATED
    8289                        $output = get_option('home');
    8390                        break;

  • trunk/wp-includes/js/tinymce/wp-mce-help.php

    r4845 r4983  
    168168        <h2><?php _e('About TinyMCE'); ?></h2>
    169169        <p><?php printf(__('Version: %s'), '2.0.9') ?></p>
    170         <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_bloginfo('home').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
     170        <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_bloginfo('url').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
    171171        <p><?php _e('Copyright &copy; 2005, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
    172172        <p><?php _e('For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.') ?></p>

  • trunk/wp-includes/link-template.php

    r4953 r4983  
    164164
    165165        if (! $link ) {
    166                 $link = get_bloginfo('home') . "/?attachment_id=$id";
     166                $link = get_bloginfo('url') . "/?attachment_id=$id";
    167167        }
    168168

  • trunk/wp-includes/post.php

    r4953 r4983  
    11991199
    12001200function is_local_attachment($url) {
    1201         if ( !strstr($url, get_bloginfo('home') ) )
    1202                 return false;
    1203         if ( strstr($url, get_bloginfo('home') . '/?attachment_id=') )
     1201        if ( !strstr($url, get_bloginfo('url') ) )
     1202                return false;
     1203        if ( strstr($url, get_bloginfo('url') . '/?attachment_id=') )
    12041204                return true;
    12051205        if ( $id = url_to_postid($url) ) {

  • trunk/wp-login.php

    r4981 r4983  
    154154        <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
    155155        <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a></li>
    156         <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
     156        <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
    157157<?php else : ?>
    158         <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
     158        <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
    159159        <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
    160160<?php endif; ?>
    … …  
    276276        <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
    277277        <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
    278         <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
     278        <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
    279279</ul>
    280280
    … …  
    367367        <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a></li>
    368368        <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
    369         <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
     369        <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
    370370<?php else : ?>
    371         <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
     371        <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
    372372        <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
    373373<?php endif; ?>
Note: See TracChangeset for help on using the changeset viewer.