Changeset 23837

Timestamp:

03/28/2013 06:45:56 AM (12 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: better back compat handling by moving version compare before the include to avoid loading the file altogether. Also prevent Customizer views. Props obenland, closes #23819.

Location:

trunk/wp-content/themes/twentythirteen

Files:

• functions.php (modified) (1 diff)
• inc/back-compat.php (modified) (2 diffs)

trunk/wp-content/themes/twentythirteen/functions.php

@@ -597 +597 @@
  * Adds back compat handling for WP versions pre-3.6.
  */
-require( get_template_directory() . '/inc/back-compat.php' );
+if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) )
+    require( get_template_directory() . '/inc/back-compat.php' );

trunk/wp-content/themes/twentythirteen/inc/back-compat.php

@@ -1 +1 @@
 <?php
+/**
+ * Prevents Twenty Thirteen from running on WordPress versions prior to 3.6.
+ *
+ * Twenty Thirteen is not meant to be backwards compatible, since it relies on
+ * a lot of new functions and markup changes that were introduced in 3.6.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Thirteen
+ * @since Twenty Thirteen 1.0
+ */
+
 /**
  * Prevent switching to Twenty Thirteen on old versions of WordPress. Switches
  * to the previously activated theme or the default theme.
+ *
+ * @since Twenty Thirteen 1.0
+ *
+ * @param string $theme_name
+ * @param WP_Theme $theme
+ * @return void
  */
 function twentythirteen_switch_theme( $theme_name, $theme ) {
-    if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '>=' ) )
-        return;
-
     if ( 'twentythirteen' != $theme->template )
         switch_theme( $theme->template, $theme->stylesheet );
@@ -18 +32 @@
 add_action( 'after_switch_theme', 'twentythirteen_switch_theme', 10, 2 );
 
+/**
+ * Prints an update nag after an unsuccessful attempt to switch to
+ * Twenty Thirteen on WordPress versions prior to 3.6.
+ *
+ * @since Twenty Thirteen 1.0
+ *
+ * @return void
+ */
 function twentythirteen_upgrade_notice() {
-    $message = sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.' ), $GLOBALS['wp_version'] );
+    $message = sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] );
     printf( '<div class="error"><p>%s</p></div>', $message );
 }
+
+/**
+ * Prevents the Customizer from being loaded on WordPress versions prior to 3.6.
+ *
+ * @since Twenty Thirteen 1.0
+ *
+ * @return void
+ */
+function twentythirteen_customize() {
+    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' ) ) );
+}
+add_action( 'load-customize.php', 'twentythirteen_customize' );