1.4.2

Changelog.txt

@@ -1,3 +1,106 @@
+2014-08-08 13:07  donncha
+
+	* wp-cache-phase1.php: Just in case the local modified time of a
+	  file is 0, disable the "last modified time" check.
+
+2014-08-08 11:32  donncha
+
+	* plugins/domain-mapping.php: Check if HTTPS exists before checking
+	  it's value to avoid warnings
+
+2014-08-08 11:24  donncha
+
+	* wp-cache.php: Replace wpdb->escape with esc_sql() as it's
+	  deprecated.
+
+2014-08-08 11:21  donncha
+
+	* wp-cache-phase2.php: Make sure $wp_cache_no_cache_for_get,
+	  $wp_cache_object_cache, $wp_cache_request_uri are visible to the
+	  OB callback to avoid warnings and fix functionality
+
+2014-08-07 14:00  donncha
+
+	* Changelog.txt, readme.txt, wp-cache.php: Updated changelog,
+	  documentation, bumped version number to 1.4.1 and tested version.
+
+2014-08-07 12:45  donncha
+
+	* wp-cache.php: Removed author information
+
+2014-08-06 12:41  kraftbj
+
+	* plugins/awaitingmoderation.php, plugins/badbehaviour.php,
+	  plugins/domain-mapping.php, plugins/jetpack.php,
+	  plugins/searchengine.php, plugins/wptouch.php, wp-cache.php: PR
+	  #13: Added .button-primary and .button-secondary classes to and
+	  removed &raquo's from buttons throughout the admin for
+	  consistency. Ref:
+	  https://github.com/Automattic/wp-super-cache/pull/13 Props:
+	  rcowles
+
+2014-08-05 20:00  kraftbj
+
+	* ossdl-cdn.php, readme.txt, wp-cache.php: Fix bad merge.
+
+2014-08-05 19:56  kraftbj
+
+	* readme.txt: Add Jetpack to mobile FAQ.
+
+2014-08-05 19:56  kraftbj
+
+	* wp-cache.php: Remove CDN Sync Tools. No longer in WP.org repo
+
+2014-08-05 19:55  kraftbj
+
+	* ossdl-cdn.php, readme.txt, wp-cache.php: Update
+	  wordpress.org/extend URLs
+
+2014-08-05 12:42  donncha
+
+	* wp-cache.php: Fix to avoid an XSS in the settings page. Props
+	  Simon Waters, Surevine Limited.
+
+2014-08-04 22:04  kraftbj
+
+	* ossdl-cdn.php: Remove reference to CDN Sync. Plugin no longer in
+	  repo.
+
+2014-07-31 21:09  kraftbj
+
+	* readme.txt: Add Jetpack to mobile FAQ.
+
+2014-07-31 21:09  kraftbj
+
+	* wp-cache.php: Remove CDN Sync Tools. No longer in WP.org repo
+
+2014-07-31 21:08  kraftbj
+
+	* ossdl-cdn.php, readme.txt, wp-cache-phase1.php, wp-cache.php:
+	  Update wordpress.org/extend URLs
+
+2014-07-31 21:08  kraftbj
+
+	* plugins/awaitingmoderation.php, plugins/badbehaviour.php,
+	  plugins/domain-mapping.php, plugins/dynamic-cache-test.php,
+	  plugins/jetpack.php, plugins/searchengine.php,
+	  plugins/wptouch.php: Trim whitespace
+
+2014-07-31 21:07  kraftbj
+
+	* wp-cache-config-sample.php, wp-cache-phase1.php, wp-cache.php:
+	  Trim whitespace
+
+2014-07-31 21:06  kraftbj
+
+	* wp-cache.php: Admin: Add clear to h3 to pretify Recommended Links
+	  title
+
+2014-07-31 20:51  donncha
+
+	* wp-cache-phase2.php: Make sure these are global so the function
+	  knows about them. Props JoHenton and richardmtl
+	  http://wordpress.org/support/topic/notices-appearing-above-site-pages-how-do-i-get-rid-of-them?replies=2
 2013-10-23 10:49  donncha
 
 	* wp-super-cache.pot: Updated translation file

advanced-cache.php

@@ -1,6 +1,10 @@
 <?php
 # WP SUPER CACHE 1.2
 function wpcache_broken_message() {
+	global $wp_cache_config_file;
+	if ( isset( $wp_cache_config_file ) == false )
+		return '';
+
 	if ( false == strpos( $_SERVER[ 'REQUEST_URI' ], 'wp-admin' ) )
 		echo "<!-- WP Super Cache is installed but broken. The constant WPCACHEHOME must be set in the file wp-config.php and point at the WP Super Cache plugin directory. -->";
 }

ossdl-cdn.php

@@ -149,7 +149,6 @@ function scossdl_off_options() {
 	$example_cdn_uri .= '/wp-includes/js/prototype.js';
 	?>
 		<p><?php _e( 'Your website probably uses lots of static files. Image, Javascript and CSS files are usually static files that could just as easily be served from another site or CDN. Therefore this plugin replaces any links in the <code>wp-content</code> and <code>wp-includes</code> directories (except for PHP files) on your site with the URL you provide below. That way you can either copy all the static content to a dedicated host or mirror the files to a CDN by <a href="http://knowledgelayer.softlayer.com/questions/365/How+does+Origin+Pull+work%3F" target="_blank">origin pull</a>.', 'wp-super-cache' ); ?></p>
-		<p><?php printf( __( 'The <a href="%1$s">CDN Sync Tool</a> plugin will help upload files to Amazon S3/Cloudfront if you would rather not depend on origin pull. See the <a href="%2$s">plugin support forum</a> if you have any queries about this plugin.', 'wp-super-cache' ), 'http://wordpress.org/extend/plugins/cdn-sync-tool/', 'http://wordpress.org/tags/cdn-sync-tool?forum_id=10' ); ?></p>
 		<p><?php printf( __( '<strong style="color: red">WARNING:</strong> Test some static urls e.g., %s  to ensure your CDN service is fully working before saving changes.', 'wp-super-cache' ), '<code>' . $example_cdn_uri . '</code>' ); ?></p>
 		<p><?php _e( 'You can define different CDN URLs for each site on a multsite network.', 'wp-super-cache' ); ?></p>
 		<p><form method="post" action="">
@@ -196,7 +195,7 @@ function scossdl_off_options() {
 		<input type="hidden" name="action" value="update_ossdl_off" />
 		<p class="submit"><input type="submit" class="button-primary" value="<?php _e('Save Changes') ?>" /></p>
 		</form></p>
-		<p><?php _e( 'CDN functionality provided by <a href="http://wordpress.org/extend/plugins/ossdl-cdn-off-linker/">OSSDL CDN Off Linker</a> by <a href="http://mark.ossdl.de/">Mark Kubacki</a>', 'wp-super-cache' ); ?></p>
+		<p><?php _e( 'CDN functionality provided by <a href="http://wordpress.org/plugins/ossdl-cdn-off-linker/">OSSDL CDN Off Linker</a> by <a href="http://mark.ossdl.de/">Mark Kubacki</a>', 'wp-super-cache' ); ?></p>
 	<?php
 }
 ?>

plugins/awaitingmoderation.php

@@ -16,7 +16,7 @@ function awaitingmoderation_actions() {
 //Your comment is awaiting moderation.
 function wp_supercache_awaitingmoderation_admin() {
 	global $cache_awaitingmoderation, $wp_cache_config_file, $valid_nonce;
-	
+
 	$cache_awaitingmoderation = $cache_awaitingmoderation == '' ? '0' : $cache_awaitingmoderation;
 
 	if(isset($_POST['cache_awaitingmoderation']) && $valid_nonce) {
@@ -28,7 +28,7 @@ function wp_supercache_awaitingmoderation_admin() {
 	}
 	$id = 'awaitingmoderation-section';
 	?>
-		<fieldset id="<?php echo $id; ?>" class="options"> 
+		<fieldset id="<?php echo $id; ?>" class="options">
 		<h4><?php _e( 'Awaiting Moderation', 'wp-super-cache' ); ?></h4>
 		<form name="wp_manager" action="" method="post">
 		<label><input type="radio" name="cache_awaitingmoderation" value="1" <?php if( $cache_awaitingmoderation ) { echo 'checked="checked" '; } ?>/> <?php _e( 'Enabled', 'wp-super-cache' ); ?></label>
@@ -42,7 +42,7 @@ function wp_supercache_awaitingmoderation_admin() {
 				$status = __( "disabled" );
 			echo "<p><strong>" . sprintf( __( "Awaiting Moderation is now %s", 'wp-super-cache' ), $status ) . "</strong></p>";
 		}
-	echo '<div class="submit"><input ' . SUBMITDISABLED . 'type="submit" value="' . __( 'Update', 'wp-super-cache' ) . '" /></div>';
+	echo '<div class="submit"><input class="button-primary" ' . SUBMITDISABLED . 'type="submit" value="' . __( 'Update', 'wp-super-cache' ) . '" /></div>';
 	wp_nonce_field('wp-cache');
 	?>
 	</form>

plugins/badbehaviour.php

@@ -33,7 +33,7 @@ function get_bb_file_loc() {
 
 function wp_supercache_badbehaviour_admin() {
 	global $cache_badbehaviour, $wp_cache_config_file, $valid_nonce;
-	
+
 	$cache_badbehaviour = $cache_badbehaviour == '' ? 0 : $cache_badbehaviour;
 	if ( $cache_badbehaviour == 'no' )
 		$cache_badbehaviour = 0;
@@ -59,7 +59,7 @@ function wp_supercache_badbehaviour_admin() {
 	}
 	$id = 'badbehavior-section';
 	?>
-		<fieldset id="<?php echo $id; ?>" class="options"> 
+		<fieldset id="<?php echo $id; ?>" class="options">
 		<h4><?php _e( 'Bad Behavior', 'wp-super-cache' ); ?></h4>
 		<form name="wp_manager" action="" method="post">
 		<label><input type="radio" name="cache_badbehaviour" value="1" <?php if( $cache_badbehaviour ) { echo 'checked="checked" '; } ?>/> <?php _e( 'Enabled', 'wp-super-cache' ); ?></label>
@@ -73,7 +73,7 @@ function wp_supercache_badbehaviour_admin() {
 				$status = __( "disabled" );
 			echo "<p><strong>" . sprintf( __( "Bad Behavior support is now %s", 'wp-super-cache' ), $status ) . "</strong></p>";
 		}
-	echo '<div class="submit"><input ' . SUBMITDISABLED . 'type="submit" value="' . __( 'Update', 'wp-super-cache' ) . '" /></div>';
+	echo '<div class="submit"><input class="button-primary" ' . SUBMITDISABLED . 'type="submit" value="' . __( 'Update', 'wp-super-cache' ) . '" /></div>';
 	wp_nonce_field('wp-cache');
 	?>
 	</form>

plugins/domain-mapping.php

@@ -10,7 +10,7 @@ function domain_mapping_gc_cache( $function, $directory ) {
 	if ( !$siteurl )
 		return false;
 
-	$protocol = ( 'on' == strtolower( $_SERVER['HTTPS' ] ) ) ? 'https://' : 'http://';
+	$protocol = ( isset( $_SERVER['HTTPS' ] ) && 'on' == strtolower( $_SERVER['HTTPS' ] ) ) ? 'https://' : 'http://';
 	$siteurl = trailingslashit( str_replace( $protocol, '', $siteurl ) );
 
 	if ( $directory == 'homepage' )
@@ -22,8 +22,8 @@ function domain_mapping_gc_cache( $function, $directory ) {
 			@wp_cache_rebuild_or_delete( $cache_path . 'supercache/' . $siteurl . $directory . 'index.html.gz' );
 		break;
 		case "prune":
-			prune_super_cache( $cache_path . 'supercache/' . $siteurl . $directory . 'index.html', true, true ); 
-			prune_super_cache( $cache_path . 'supercache/' . $siteurl . $directory . 'index.html.gz', true, true ); 
+			prune_super_cache( $cache_path . 'supercache/' . $siteurl . $directory . 'index.html', true, true );
+			prune_super_cache( $cache_path . 'supercache/' . $siteurl . $directory . 'index.html.gz', true, true );
 		break;
 	}
 
@@ -39,7 +39,7 @@ function domain_mapping_supercachedir( $dir ) {
 	if ( !$siteurl )
 		return $dir;
 
-	$protocol = ( 'on' == strtolower( $_SERVER['HTTPS' ] ) ) ? 'https://' : 'http://';
+	$protocol = ( isset( $_SERVER['HTTPS' ] ) && 'on' == strtolower( $_SERVER['HTTPS' ] ) ) ? 'https://' : 'http://';
 	$siteurl = str_replace( $protocol, '', $siteurl );
 	return $cache_path . 'supercache/' . $siteurl;
 }
@@ -55,7 +55,7 @@ function domain_mapping_actions() {
 
 function wp_supercache_domain_mapping_admin() {
 	global $cache_domain_mapping, $wp_cache_config_file, $valid_nonce;
-	
+
 	$cache_domain_mapping = $cache_domain_mapping == '' ? '0' : $cache_domain_mapping;
 
 	if(isset($_POST['cache_domain_mapping']) && $valid_nonce) {
@@ -69,7 +69,7 @@ function wp_supercache_domain_mapping_admin() {
 	}
 	$id = 'domain_mapping-section';
 	?>
-		<fieldset id="<?php echo $id; ?>" class="options"> 
+		<fieldset id="<?php echo $id; ?>" class="options">
 		<h4><?php _e( 'Domain Mapping', 'wp-super-cache' ); ?></h4>
 		<form name="wp_manager" action="" method="post">
 		<label><input type="radio" name="cache_domain_mapping" value="1" <?php if( $cache_domain_mapping ) { echo 'checked="checked" '; } ?>/> <?php _e( 'Enabled', 'wp-super-cache' ); ?></label>
@@ -83,7 +83,7 @@ function wp_supercache_domain_mapping_admin() {
 				$status = __( "disabled" );
 			echo "<p><strong>" . sprintf( __( "Domain Mapping support is now %s", 'wp-super-cache' ), $status ) . "</strong></p>";
 		}
-	echo '<div class="submit"><input ' . SUBMITDISABLED . 'type="submit" value="' . __( 'Update', 'wp-super-cache' ) . '" /></div>';
+	echo '<div class="submit"><input class="button-primary" ' . SUBMITDISABLED . 'type="submit" value="' . __( 'Update', 'wp-super-cache' ) . '" /></div>';
 	wp_nonce_field('wp-cache');
 	?>
 	</form>