WP Merge - needs testing.

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@797 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 4 insertions, 4 deletions

diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 3f7b2c6..9f6d7b5 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -69,9 +69,9 @@ require_once('admin-header.php');
 <h2><?php _e('Current Theme'); ?></h2>
 <div id="currenttheme">
 <?php if ( $ct->screenshot ) : ?>
-<img src="<?php echo get_option('siteurl') . '/' . $ct->stylesheet_dir . '/' . $ct->screenshot; ?>" alt="<?php _e('Current theme preview'); ?>" />
+<img src="../<?php echo  $ct->stylesheet_dir . '/' . $ct->screenshot; ?>" alt="<?php _e('Current theme preview'); ?>" />
 <?php endif; ?>
-<h3><?php printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?></h3>
+<h3><?php printf(__('%1$s %2$s by %3$s'), $ct->title, '', $ct->author) ; ?></h3>
 <p><?php echo $ct->description; ?></p>
 </div>
 
@@ -98,11 +98,11 @@ foreach ($theme_names as $theme_name) {
 	$activate_link = wp_nonce_url("themes.php?action=activate&amp;template=$template&amp;stylesheet=$stylesheet", 'switch-theme_' . $template);
 ?>
 <div class="available-theme">
-<h3><a href="<?php echo $activate_link; ?>"><?php echo "$title $version"; ?></a></h3>
+<h3><a href="<?php echo $activate_link; ?>"><?php echo "$title"; ?></a></h3>
 
 <a href="<?php echo $activate_link; ?>" class="screenshot">
 <?php if ( $screenshot ) : ?>
-<img src="<?php echo get_option('siteurl') . '/' . $stylesheet_dir . '/' . $screenshot; ?>" alt="" />
+<img src="../<?php echo $stylesheet_dir . '/' . $screenshot; ?>" alt="" />
 <?php endif; ?>
 </a>