<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13256] trunk/wp-admin: Use admin_url() for images in wp-admin,
to allow for filtering.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13256">13256</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-20 21:09:49 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use admin_url() for images in wp-admin, to allow for filtering. Props mdawaffe, see <a href="http://trac.wordpress.org/ticket/12300">#12300</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminimportlivejournalphp">trunk/wp-admin/import/livejournal.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludeswidgetsphp">trunk/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/admin-header.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<img id="header-logo" src="../wp-includes/images/blank.gif" alt="" width="32" height="32" /> <h1 id="site-heading" <?php echo $title_class ?>><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php esc_attr_e('Visit Site') ?>"><span id="site-title"><?php echo $blog_name ?></span> <em id="site-visit-button"><?php _e('Visit Site') ?></em></a><?php if ( ! get_option('blog_public') ) { ?> <a id="privacy-on-link" href="options-privacy.php" title="<?php esc_attr_e('Your blog is hidden from search engines') ?>"><?php _e('Privacy On') ?></a><?php } ?></h1>
</del><ins>+<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="32" height="32" /> <h1 id="site-heading" <?php echo $title_class ?>><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php esc_attr_e('Visit Site') ?>"><span id="site-title"><?php echo $blog_name ?></span> <em id="site-visit-button"><?php _e('Visit Site') ?></em></a><?php if ( ! get_option('blog_public') ) { ?> <a id="privacy-on-link" href="options-privacy.php" title="<?php esc_attr_e('Your blog is hidden from search engines') ?>"><?php _e('Privacy On') ?></a><?php } ?></h1>
</ins><span class="cx">
</span><span class="cx"> <div id="wphead-info">
</span><span class="cx"> <div id="user_info">
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/edit.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -360,8 +360,8 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div class="view-switch">
</span><del>- <a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
- <a href="<?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
</del><ins>+ <a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
+ <a href="<?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="clear"></div>
</span></span></pre></div>
<a id="trunkwpadminimportlivejournalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/livejournal.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/livejournal.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/import/livejournal.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx"> if ( next_counter <= 0 ) {
</span><span class="cx"> if ( jQuery( '#<?php echo $id ?>' ).length ) {
</span><span class="cx"> jQuery( "#<?php echo $id ?> input[type='submit']" ).hide();
</span><del>- str = '<?php _e( "Continuing&#8230;" ) ?> <img src="images/wpspin_light.gif" alt="" id="processing" align="top" />';
</del><ins>+ str = '<?php _e( "Continuing&#8230;" ) ?> <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="processing" align="top" />';
</ins><span class="cx"> jQuery( '#<?php echo $msg ?>' ).html( str );
</span><span class="cx"> jQuery( '#<?php echo $id ?>' ).submit();
</span><span class="cx"> return;
</span><span class="lines">@@ -997,7 +997,7 @@
</span><span class="cx"> if ( jQuery( '#<?php echo $id ?>' ).length ) {
</span><span class="cx"> jQuery( "#<?php echo $id ?> input[type='submit']" ).hide();
</span><span class="cx"> jQuery.ajaxSetup({'timeout':3600000});
</span><del>- str = '<?php _e( "Processing next batch." ) ?> <img src="images/wpspin_light.gif" alt="" id="processing" align="top" />';
</del><ins>+ str = '<?php _e( "Processing next batch." ) ?> <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="processing" align="top" />';
</ins><span class="cx"> jQuery( '#<?php echo $msg ?>' ).html( str );
</span><span class="cx"> jQuery('#ljapi-status').load(ajaxurl, {'action':'lj-importer',
</span><span class="cx"> 'step':jQuery('#step').val(),
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/includes/dashboard.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> <input type="reset" value="<?php esc_attr_e( 'Reset' ); ?>" class="button" />
</span><span class="cx"> <span id="publishing-action">
</span><span class="cx"> <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?>" />
</span><del>- <img class="waiting" src="images/wpspin_light.gif" />
</del><ins>+ <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" />
</ins><span class="cx"> </span>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </p>
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/includes/media.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -376,12 +376,12 @@
</span><span class="cx"> $out = '';
</span><span class="cx">
</span><span class="cx"> if ( $do_image )
</span><del>- $out .= "<a href='{$image_upload_iframe_src}&amp;TB_iframe=true' id='add_image' class='thickbox' title='$image_title' onclick='return false;'><img src='images/media-button-image.gif' alt='$image_title' /></a>";
</del><ins>+ $out .= "<a href='{$image_upload_iframe_src}&amp;TB_iframe=true' id='add_image' class='thickbox' title='$image_title' onclick='return false;'><img src='" . esc_url( admin_url( 'images/media-button-image.gif' ) ) . "' alt='$image_title' /></a>";
</ins><span class="cx"> if ( $do_video )
</span><del>- $out .= "<a href='{$video_upload_iframe_src}&amp;TB_iframe=true' id='add_video' class='thickbox' title='$video_title' onclick='return false;'><img src='images/media-button-video.gif' alt='$video_title' /></a>";
</del><ins>+ $out .= "<a href='{$video_upload_iframe_src}&amp;TB_iframe=true' id='add_video' class='thickbox' title='$video_title' onclick='return false;'><img src='" . esc_url( admin_url( 'images/media-button-video.gif' ) ) . "' alt='$video_title' /></a>";
</ins><span class="cx"> if ( $do_audio )
</span><del>- $out .= "<a href='{$audio_upload_iframe_src}&amp;TB_iframe=true' id='add_audio' class='thickbox' title='$audio_title' onclick='return false;'><img src='images/media-button-music.gif' alt='$audio_title' /></a>";
- $out .= "<a href='{$media_upload_iframe_src}&amp;TB_iframe=true' id='add_media' class='thickbox' title='$media_title' onclick='return false;'><img src='images/media-button-other.gif' alt='$media_title' /></a>";
</del><ins>+ $out .= "<a href='{$audio_upload_iframe_src}&amp;TB_iframe=true' id='add_audio' class='thickbox' title='$audio_title' onclick='return false;'><img src='" . esc_url( admin_url( 'images/media-button-music.gif' ) ) . "' alt='$audio_title' /></a>";
+ $out .= "<a href='{$media_upload_iframe_src}&amp;TB_iframe=true' id='add_media' class='thickbox' title='$media_title' onclick='return false;'><img src='" . esc_url( admin_url( 'images/media-button-other.gif' ) ) . "' alt='$media_title' /></a>";
</ins><span class="cx">
</span><span class="cx"> printf($context, $out);
</span><span class="cx"> }
</span><span class="lines">@@ -1214,7 +1214,7 @@
</span><span class="cx"> $image_edit_button = '';
</span><span class="cx"> if ( gd_edit_image_support( $post->post_mime_type ) ) {
</span><span class="cx"> $nonce = wp_create_nonce( "image_editor-$post->ID" );
</span><del>- $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='images/wpspin_light.gif' class='imgedit-wait-spin' alt='' />";
</del><ins>+ $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' class='imgedit-wait-spin' alt='' />";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $attachment_url = get_permalink( $attachment_id );
</span><span class="lines">@@ -1631,7 +1631,7 @@
</span><span class="cx"> document.getElementById('go_button').style.color = '#bbb';
</span><span class="cx"> if ( ! document.forms[0].src.value )
</span><span class="cx"> document.getElementById('status_img').innerHTML = '*';
</span><del>- else document.getElementById('status_img').innerHTML = '<img src="images/no.png" alt="" />';
</del><ins>+ else document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/no.png' ) ); ?>" alt="" />';
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateImageData : function() {
</span><span class="lines">@@ -1640,7 +1640,7 @@
</span><span class="cx"> t.width = t.preloadImg.width;
</span><span class="cx"> t.height = t.preloadImg.height;
</span><span class="cx"> document.getElementById('go_button').style.color = '#333';
</span><del>- document.getElementById('status_img').innerHTML = '<img src="images/yes.png" alt="" />';
</del><ins>+ document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/yes.png' ) ); ?>" alt="" />';
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getImageData : function() {
</span><span class="lines">@@ -1650,7 +1650,7 @@
</span><span class="cx"> t.resetImageData();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- document.getElementById('status_img').innerHTML = '<img src="images/wpspin_light.gif" alt="" />';
</del><ins>+ document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />';
</ins><span class="cx"> t.preloadImg = new Image();
</span><span class="cx"> t.preloadImg.onload = t.updateImageData;
</span><span class="cx"> t.preloadImg.onerror = t.resetImageData;
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="publishing-action">
</span><del>-<img src="images/wpspin_light.gif" id="ajax-loading" style="visibility:hidden;" alt="" />
</del><ins>+<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" id="ajax-loading" style="visibility:hidden;" alt="" />
</ins><span class="cx"> <?php
</span><span class="cx"> if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
</span><span class="cx"> if ( $can_publish ) :
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> </tr></thead>
</span><span class="cx"> <tbody id="the-comment-list" class="list:comment"></tbody>
</span><span class="cx"> </table>
</span><del>-<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="images/wpspin_light.gif" alt="" /></p>
</del><ins>+<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /></p>
</ins><span class="cx"> <?php
</span><span class="cx"> $hidden = get_hidden_meta_boxes('post');
</span><span class="cx"> if ( ! in_array('commentsdiv', $hidden) ) { ?>
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/includes/plugin.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -821,7 +821,7 @@
</span><span class="cx"> add_action( $hookname, $function );
</span><span class="cx">
</span><span class="cx"> if ( empty($icon_url) ) {
</span><del>- $icon_url = 'images/generic.png';
</del><ins>+ $icon_url = esc_url( admin_url( 'images/generic.png' ) );
</ins><span class="cx"> } elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') ) {
</span><span class="cx"> $icon_url = 'https://' . substr($icon_url, 7);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/includes/template.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
</span><span class="cx"> <?php $update_text = ( 'post_tag' == $taxonomy ) ? __( 'Update Tag' ) : __( 'Update Category' ); ?>
</span><span class="cx"> <a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
</span><del>- <img class="waiting" style="display:none;" src="images/wpspin_light.gif" alt="" />
</del><ins>+ <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <span class="error" style="display:none;"></span>
</span><span class="cx"> <?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
</span><span class="cx"> <br class="clear" />
</span><span class="lines">@@ -671,7 +671,7 @@
</span><span class="cx"> $posts_columns['tags'] = __('Tags');
</span><span class="cx"> $post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
</span><span class="cx"> if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($post_type) || post_type_supports($post_type, 'comments') ) )
</span><del>- $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>';
</del><ins>+ $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
</ins><span class="cx"> $posts_columns['date'] = __('Date');
</span><span class="cx"> // @todo filter per type
</span><span class="cx"> $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> //$posts_columns['tags'] = _x('Tags', 'column name');
</span><span class="cx"> /* translators: column name */
</span><span class="cx"> $posts_columns['parent'] = _x('Attached to', 'column name');
</span><del>- $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>';
</del><ins>+ $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
</ins><span class="cx"> //$posts_columns['comments'] = __('Comments');
</span><span class="cx"> /* translators: column name */
</span><span class="cx"> $posts_columns['date'] = _x('Date', 'column name');
</span><span class="lines">@@ -1165,7 +1165,7 @@
</span><span class="cx"> $update_text = __( 'Update' );
</span><span class="cx"> ?>
</span><span class="cx"> <a accesskey="s" href="#inline-edit" title="<?php _e('Update'); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
</span><del>- <img class="waiting" style="display:none;" src="images/wpspin_light.gif" alt="" />
</del><ins>+ <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <?php } else {
</span><span class="cx"> $update_text = __( 'Update' );
</span><span class="cx"> ?>
</span><span class="lines">@@ -2276,7 +2276,7 @@
</span><span class="cx"> <a href="#comments-form" class="save button-primary alignright" tabindex="104">
</span><span class="cx"> <span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
</span><span class="cx"> <span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
</span><del>- <img class="waiting" style="display:none;" src="images/wpspin_light.gif" alt="" />
</del><ins>+ <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <span class="error" style="display:none;"></span>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </p>
</span><span class="lines">@@ -2611,7 +2611,7 @@
</span><span class="cx"> function browse_happy() {
</span><span class="cx"> $getit = __( 'WordPress recommends a better browser' );
</span><span class="cx"> echo '
</span><del>- <div id="bh"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></div>
</del><ins>+ <div id="bh"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="' . esc_url( admin_url( 'images/browse-happy.gif' ) ) . '" alt="Browse Happy" /></a></div>
</ins><span class="cx"> ';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/widgets.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/widgets.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/includes/widgets.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> <a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
</span><del>- <img src="images/wpspin_light.gif" class="ajax-feedback " title="" alt="" />
</del><ins>+ <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback " title="" alt="" />
</ins><span class="cx"> <input type="submit" name="savewidget" class="button-primary widget-control-save" value="<?php esc_attr_e('Save'); ?>" />
</span><span class="cx"> </div>
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/ms-edit.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> <?php wp_admin_css( 'install', true ); ?>
</span><span class="cx"> </head>
</span><span class="cx"> <body id="error-page">
</span><del>- <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
</del><ins>+ <h1 id="logo"><img alt="WordPress" src="<?php echo esc_url( admin_url( 'images/wordpress-logo.png' ) ); ?>" /></h1>
</ins><span class="cx"> <form action='ms-edit.php?action=<?php echo esc_attr( $_GET[ 'action2' ] ) ?>' method='post'>
</span><span class="cx"> <input type='hidden' name='action' value='<?php echo esc_attr( $_GET['action2'] ) ?>' />
</span><span class="cx"> <input type='hidden' name='id' value='<?php echo esc_attr( $id ); ?>' />
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/press-this.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> jQuery('#waiting').hide();
</span><span class="cx"> jQuery('#extra-fields').show();
</span><span class="cx"> }
</span><del>- jQuery('#extra-fields').before('<div id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
</del><ins>+ jQuery('#extra-fields').before('<div id="waiting"><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
</ins><span class="cx">
</span><span class="cx"> if(photostorage == false) {
</span><span class="cx"> jQuery.ajax({
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <br /><br /><input class="button-primary" type="submit" name="review" value="<?php esc_attr_e('Submit for Review') ?>" id="review" />
</span><span class="cx"> <?php } ?>
</span><del>- <img src="images/wpspin_light.gif" alt="" id="saving" style="display:none;" />
</del><ins>+ <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="saving" style="display:none;" />
</ins><span class="cx"> </p>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -547,11 +547,11 @@
</span><span class="cx">
</span><span class="cx"> <li id="photo_button">
</span><span class="cx"> Add: <?php if ( current_user_can('upload_files') ) { ?><a title="<?php _e('Insert an Image'); ?>" href="#">
</span><del>-<img alt="<?php _e('Insert an Image'); ?>" src="images/media-button-image.gif"/></a>
</del><ins>+<img alt="<?php _e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif' ) ); ?>"/></a>
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> </li>
</span><span class="cx"> <li id="video_button">
</span><del>- <a title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="images/media-button-video.gif"/></a>
</del><ins>+ <a title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-video.gif' ) ); ?>"/></a>
</ins><span class="cx"> </li>
</span><span class="cx"> <?php if ( user_can_richedit() ) { ?>
</span><span class="cx"> <li id="switcher">
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2010-02-20 21:00:19 UTC (rev 13255)
+++ trunk/wp-admin/widgets.php 2010-02-20 21:09:49 UTC (rev 13256)
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"><br /></div>
</span><span class="cx"> <h3><?php _e('Inactive Widgets'); ?>
</span><del>- <span><img src="images/wpspin_light.gif" class="ajax-feedback" title="" alt="" /></span></h3></div>
</del><ins>+ <span><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span></h3></div>
</ins><span class="cx"> <div class="widget-holder inactive">
</span><span class="cx"> <p class="description"><?php _e('Drag widgets here to remove them from the sidebar but keep their settings.'); ?></p>
</span><span class="cx"> <?php wp_list_widget_controls('wp_inactive_widgets'); ?>
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"><br /></div>
</span><span class="cx"> <h3><?php echo esc_html( $registered_sidebar['name'] ); ?>
</span><del>- <span><img src="images/wpspin_dark.gif" class="ajax-feedback" title="" alt="" /></span></h3></div>
</del><ins>+ <span><img src="<?php echo esc_url( admin_url( 'images/wpspin_dark.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span></h3></div>
</ins><span class="cx"> <?php wp_list_widget_controls( $sidebar ); // Show the control forms for each of the widgets in this sidebar ?>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>