<!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>[24411] trunk/wp-content/themes/twentythirteen/inc/back-compat.php: Twenty Thirteen: improve backward compatibility escape hatch for pre-3.6 versions:</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/24411">24411</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-06-06 00:22:09 +0000 (Thu, 06 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Thirteen: improve backward compatibility escape hatch for pre-3.6 versions:
* Switch to the built-in method of providing a back link in `wp_die()` for the Customizer
* Use WP_DEFAULT_THEME for both arguments during theme switching to simplify the logic
* Prevent the 3.3 and earlier theme preview action gracefully
Props obenland for patches, fixes <a href="http://core.trac.wordpress.org/ticket/24441">#24441</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteenincbackcompatphp">trunk/wp-content/themes/twentythirteen/inc/back-compat.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentythirteenincbackcompatphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/inc/back-compat.php (24410 => 24411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/inc/back-compat.php 2013-06-05 21:50:23 UTC (rev 24410)
+++ trunk/wp-content/themes/twentythirteen/inc/back-compat.php 2013-06-06 00:22:09 UTC (rev 24411)
</span><span class="lines">@@ -13,24 +13,18 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Prevent switching to Twenty Thirteen on old versions of WordPress. Switches
</span><del>- * to the previously activated theme or the default theme.
</del><ins>+ * to the default theme.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Thirteen 1.0
</span><span class="cx"> *
</span><del>- * @param string $theme_name The theme name.
- * @param WP_Theme $theme The theme object.
</del><span class="cx"> * @return void
</span><span class="cx"> */
</span><del>-function twentythirteen_switch_theme( $theme_name, $theme ) {
- if ( 'twentythirteen' != $theme->get_template() )
- switch_theme( $theme->get_template(), $theme->get_stylesheet() );
- elseif ( 'twentythirteen' != WP_DEFAULT_THEME )
- switch_theme( WP_DEFAULT_THEME );
-
</del><ins>+function twentythirteen_switch_theme() {
+ switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
</ins><span class="cx"> unset( $_GET['activated'] );
</span><span class="cx"> add_action( 'admin_notices', 'twentythirteen_upgrade_notice' );
</span><span class="cx"> }
</span><del>-add_action( 'after_switch_theme', 'twentythirteen_switch_theme', 10, 2 );
</del><ins>+add_action( 'after_switch_theme', 'twentythirteen_switch_theme' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Prints an update nag after an unsuccessful attempt to switch to
</span><span class="lines">@@ -53,6 +47,22 @@
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="cx"> function twentythirteen_customize() {
</span><del>- wp_die( sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ) . sprintf( ' <a href="javascript:history.go(-1);">%s</a>', __( 'Go back.', 'twentythirteen' ) ) );
</del><ins>+ wp_die( sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ), '', array(
+ 'back_link' => true,
+ ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'load-customize.php', 'twentythirteen_customize' );
</span><ins>+
+/**
+ * Prevents the Theme Preview from being loaded on WordPress versions prior to 3.4.
+ *
+ * @since Twenty Thirteen 1.0
+ *
+ * @return void
+ */
+function twentythirteen_preview() {
+ if ( isset( $_GET['preview'] ) ) {
+ wp_die( sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ) );
+ }
+}
+add_action( 'template_redirect', 'twentythirteen_preview' );
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>