From c9685b895ae4c096b389c57e3475653f4adce629 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 17 Nov 2005 10:10:10 +0000
Subject: [PATCH] Trailing slashes. Propers to Mark Jaquith.  fixes #1893

git-svn-id: http://svn.automattic.com/wordpress/trunk@3134 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/post.php                        |  2 +-
 wp-admin/themes.php                      |  4 ++--
 wp-content/themes/classic/header.php     |  4 ++--
 wp-content/themes/default/header.php     |  2 +-
 wp-content/themes/default/searchform.php |  4 ++--
 wp-content/themes/default/sidebar.php    | 10 +++++-----
 wp-login.php                             |  4 ++--
 wp-register.php                          |  4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 5dd50c53f..e0620ab33 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -308,7 +308,7 @@ default:
 	require_once ('./admin-header.php');
 ?>
 <?php if ( isset($_GET['posted']) ) : ?>
-<div id="message" class="updated fade"><p><?php printf(__('Post saved. <a href="%s">View site &raquo;</a>'), get_bloginfo('home')); ?></p></div>
+<div id="message" class="updated fade"><p><?php printf(__('Post saved. <a href="%s">View site &raquo;</a>'), get_bloginfo('home') . '/'); ?></p></div>
 <?php endif; ?>
 <?php
 	if ( current_user_can('edit_posts') ) {
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index e90d0cad9..8a2327f2a 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -26,7 +26,7 @@ require_once('admin-header.php');
 <?php if ( ! validate_current_theme() ) : ?>
 <div id="message1" class="updated fade"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
 <?php elseif ( isset($_GET['activated']) ) : ?>
-<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site &raquo;</a>'), get_bloginfo('home')); ?></p></div>
+<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site &raquo;</a>'), get_bloginfo('home') . '/'); ?></p></div>
 <?php endif; ?>
 
 <?php
@@ -128,4 +128,4 @@ if ( count($broken_themes) ) {
 
 </div>
 
-<?php require('admin-footer.php'); ?>
\ No newline at end of file
+<?php require('admin-footer.php'); ?>
diff --git a/wp-content/themes/classic/header.php b/wp-content/themes/classic/header.php
index 2c1d7c440..e505e298a 100644
--- a/wp-content/themes/classic/header.php
+++ b/wp-content/themes/classic/header.php
@@ -24,7 +24,7 @@
 
 <body>
 <div id="rap">
-<h1 id="header"><a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a></h1>
+<h1 id="header"><a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a></h1>
 
 <div id="content">
-<!-- end header -->
\ No newline at end of file
+<!-- end header -->
diff --git a/wp-content/themes/default/header.php b/wp-content/themes/default/header.php
index 977daf003..65ea78b3a 100644
--- a/wp-content/themes/default/header.php
+++ b/wp-content/themes/default/header.php
@@ -49,7 +49,7 @@
 
 <div id="header">
 	<div id="headerimg">
-		<h1><a href="<?php echo get_settings('home'); ?>"><?php bloginfo('name'); ?></a></h1>
+		<h1><a href="<?php echo get_settings('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
 		<div class="description"><?php bloginfo('description'); ?></div>
 	</div>
 </div>
diff --git a/wp-content/themes/default/searchform.php b/wp-content/themes/default/searchform.php
index 12e5efe72..c7c73f173 100644
--- a/wp-content/themes/default/searchform.php
+++ b/wp-content/themes/default/searchform.php
@@ -1,5 +1,5 @@
-<form method="get" id="searchform" action="<?php bloginfo('home'); ?>">
+<form method="get" id="searchform" action="<?php bloginfo('home'); ?>/">
 <div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" />
 <input type="submit" id="searchsubmit" value="Search" />
 </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
index 13687068e..03364b893 100644
--- a/wp-content/themes/default/sidebar.php
+++ b/wp-content/themes/default/sidebar.php
@@ -17,23 +17,23 @@
 			<p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
 			
 			<?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('home'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
 			for the day <?php the_time('l, F jS, Y'); ?>.</p>
 			
 			<?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('home'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
 			for <?php the_time('F, Y'); ?>.</p>
 
       <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('home'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
 			for the year <?php the_time('Y'); ?>.</p>
 			
 		 <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
-			<p>You have searched the <a href="<?php echo bloginfo('home'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You have searched the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
 			for <strong>'<?php echo wp_specialchars($s); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
 
 			<?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
-			<p>You are currently browsing the <a href="<?php echo bloginfo('home'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
+			<p>You are currently browsing the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
 
 			<?php } ?>
 			</li>
diff --git a/wp-login.php b/wp-login.php
index 64133e4ea..5039888b2 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -76,7 +76,7 @@ if ($error)
 <p class="submit"><input type="submit" name="submit" id="submit" value="<?php _e('Retrieve Password'); ?> &raquo;" tabindex="3" /></p>
 </form>
 <ul>
-	<li><a href="<?php bloginfo('home'); ?>" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
+	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
 <?php if (get_settings('users_can_register')) : ?>
 	<li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
 <?php endif; ?>
@@ -239,7 +239,7 @@ if ( $error )
 </p>
 </form>
 <ul>
-	<li><a href="<?php bloginfo('home'); ?>" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
+	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
 <?php if (get_settings('users_can_register')) : ?>
 	<li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
 <?php endif; ?>
diff --git a/wp-register.php b/wp-register.php
index b3e556b2d..e59def09c 100644
--- a/wp-register.php
+++ b/wp-register.php
@@ -113,7 +113,7 @@ default:
 	<p class="submit"><input type="submit" value="<?php _e('Register') ?> &raquo;" id="submit" name="submit" /></p>
 </form>
 <ul>
-	<li><a href="<?php bloginfo('home'); ?>" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
+	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
 	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
 	<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>
 </ul>
@@ -141,7 +141,7 @@ case 'disabled':
 <div id="login">
 	<h2><?php _e('Registration Disabled') ?></h2>
 	<p><?php _e('User registration is currently not allowed.') ?><br />
-	<a href="<?php echo get_settings('home') . '/'; ?>" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a>
+	<a href="<?php echo get_settings('home'); ?>/" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a>
 	</p>
 </div>
 
