<!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" />
<title>[26470] trunk/src/wp-admin: Themes: Do extra Cap checks before outputting links, and use full URI's.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26470">26470</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-11-29 09:00:23 +0000 (Fri, 29 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Themes: Do extra Cap checks before outputting links, and use full URI's. See <a href="http://core.trac.wordpress.org/ticket/25948">#25948</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/theme.php (26469 => 26470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/theme.php 2013-11-29 08:37:17 UTC (rev 26469)
+++ trunk/src/wp-admin/includes/theme.php 2013-11-29 09:00:23 UTC (rev 26470)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> $update = $themes_update->response[ $stylesheet ];
</span><span class="cx"> $theme_name = $theme->display('Name');
</span><span class="cx"> $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
</span><del>- $update_url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
</del><ins>+ $update_url = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
</ins><span class="cx"> $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"';
</span><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span><span class="lines">@@ -414,9 +414,9 @@
</span><span class="cx"> 'hasUpdate' => isset( $updates[ $slug ] ),
</span><span class="cx"> 'update' => get_theme_update_available( $theme ),
</span><span class="cx"> 'actions' => array(
</span><del>- 'activate' => wp_nonce_url( 'themes.php?action=activate&stylesheet=' . $encoded_slug, 'switch-theme_' . $slug ),
- 'customize'=> admin_url( 'customize.php?theme=' . $encoded_slug ),
- 'delete' => wp_nonce_url( 'themes.php?action=delete&stylesheet=' . $encoded_slug, 'delete-theme_' . $slug ),
</del><ins>+ 'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
+ 'customize'=> current_user_can( 'edit_theme_options' ) ? admin_url( 'customize.php?theme=' . $encoded_slug ) : null,
+ 'delete' => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
</ins><span class="cx"> ),
</span><span class="cx"> );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/themes.php (26469 => 26470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/themes.php 2013-11-29 08:37:17 UTC (rev 26469)
+++ trunk/src/wp-admin/themes.php 2013-11-29 09:00:23 UTC (rev 26470)
</span><span class="lines">@@ -92,10 +92,9 @@
</span><span class="cx"> 'themes' => $themes,
</span><span class="cx"> 'settings' => array(
</span><span class="cx"> 'canInstall' => ( ! is_multisite() && current_user_can( 'install_themes' ) ),
</span><del>- 'installURI' => admin_url( 'theme-install.php' ),
- 'customizeURI' => ( current_user_can( 'edit_theme_options' ) ) ? wp_customize_url() : null,
</del><ins>+ 'installURI' => ( ! is_multisite() && current_user_can( 'install_themes' ) ) ? admin_url( 'theme-install.php' ) : null,
</ins><span class="cx"> 'confirmDelete' => __( "Are you sure you want to delete this theme?\n\nClick 'Cancel' to go back, 'OK' to confirm the delete." ),
</span><del>- 'root' => '/wp-admin/themes.php',
</del><ins>+ 'root' => admin_url( 'themes.php' ),
</ins><span class="cx"> 'extraRoutes' => '',
</span><span class="cx"> ),
</span><span class="cx"> 'l10n' => array(
</span><span class="lines">@@ -220,12 +219,12 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
</span><span class="cx"> <h3 class="theme-name">{{ data.name }}</h3>
</span><ins>+
</ins><span class="cx"> <div class="theme-actions">
</span><span class="cx">
</span><span class="cx"> <# if ( data.active ) { #>
</span><del>- <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
- <# if ( wp.themes.data.settings['customizeURI'] ) { #>
- <a class="button button-primary hide-if-no-customize" href="{{ wp.themes.data.settings['customizeURI'] }}"><?php _e( 'Customize' ); ?></a>
</del><ins>+ <# if ( data.actions['customize'] ) { #>
+ <a class="button button-primary hide-if-no-customize" href="{{ data.actions['customize'] }}"><?php _e( 'Customize' ); ?></a>
</ins><span class="cx"> <# } #>
</span><span class="cx"> <# } else { #>
</span><span class="cx"> <a class="button button-primary activate" href="{{{ data.actions['activate'] }}}"><?php _e( 'Activate' ); ?></a>
</span><span class="lines">@@ -292,7 +291,7 @@
</span><span class="cx"> <div class="theme-actions">
</span><span class="cx"> <div class="active-theme">
</span><span class="cx"> <a href="{{{ wp.themes.data.settings.customizeURI }}}" class="button button-primary hide-if-no-customize"><?php _e( 'Customize' ); ?></a>
</span><del>- <?php if( current_theme_supports( 'menus' ) ) { ?>
</del><ins>+ <?php if ( current_theme_supports( 'menus' ) ) { ?>
</ins><span class="cx"> <a class="button button-secondary" href="<?php echo admin_url( 'nav-menus.php' ); ?>"><?php _e( 'Menus' ); ?></a>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <?php if( current_theme_supports( 'widgets' ) ) { ?>
</span><span class="lines">@@ -300,11 +299,13 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="inactive-theme">
</span><del>- <a href="{{{ data.actions.activate }}}" class="button button-primary"><?php _e( 'Activate' ); ?></a>
</del><ins>+ <# if ( data.actions.activate ) { #>
+ <a href="{{{ data.actions.activate }}}" class="button button-primary"><?php _e( 'Activate' ); ?></a>
+ <# } #>
</ins><span class="cx"> <a href="{{{ data.actions.customize }}}" class="button button-secondary"><?php _e( 'Live Preview' ); ?></a>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <# if ( ! data.active ) { #>
</del><ins>+ <# if ( ! data.active && data.actions.delete ) { #>
</ins><span class="cx"> <a href="{{{ data.actions.delete }}}" class="delete-theme"><?php _e( 'Delete' ); ?></a>
</span><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>