Changeset 8040

Timestamp:

06/03/2008 05:17:45 PM (17 years ago)

Author:

ryan

Message:

Use WP_CONTENT_DIR and URL when linking to theme screenshots. Props sambauers. see #6938

Location:

trunk

Files:

• wp-admin/themes.php (modified) (2 diffs)
• wp-includes/theme.php (modified) (1 diff)

trunk/wp-admin/themes.php

@@ -58 +58 @@
 <div id="current-theme">
 <?php if ( $ct->screenshot ) : ?>
-<img src="<?php echo site_url($ct->stylesheet_dir . '/' . $ct->screenshot); ?>" alt="<?php _e('Current theme preview'); ?>" />
+<img src="<?php echo WP_CONTENT_URL . $ct->stylesheet_dir . '/' . $ct->screenshot; ?>" alt="<?php _e('Current theme preview'); ?>" />
 <?php endif; ?>
 <h3><?php printf(_c('%1$s %2$s by %3$s|1: theme title, 2: theme version, 3: theme author'), $ct->title, $ct->version, $ct->author) ; ?></h3>
@@ -127 +127 @@
         <a href="<?php echo $activate_link; ?>" class="<?php echo $thickbox_class; ?> screenshot">
 <?php if ( $screenshot ) : ?>
-            <img src="<?php echo ( $tpage == 'stage' ) ? $screenshot : site_url($stylesheet_dir . '/' . $screenshot); ?>" alt="" />
+            <img src="<?php echo WP_CONTENT_URL . $stylesheet_dir . '/' . $screenshot; ?>" alt="" />
 <?php endif; ?>
         </a>

trunk/wp-includes/theme.php

@@ -129 +129 @@
     $wp_broken_themes = array();
     $theme_loc = $theme_root = get_theme_root();
-    if ( '/' != ABSPATH ) // don't want to replace all forward slashes, see Trac #4541
-        $theme_loc = str_replace(ABSPATH, '', $theme_root);
+    if ( '/' != WP_CONTENT_DIR ) // don't want to replace all forward slashes, see Trac #4541
+        $theme_loc = str_replace(WP_CONTENT_DIR, '', $theme_root);
 
     // Files in wp-content/themes directory and one subdir down