Release 3.6.2

johngodley · Nov 10, 2018 · aaac00c · aaac00c
1 parent d5f596e
commit aaac00c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -174,13 +174,13 @@ const copyPlugin = ( target, cb ) => gulp.src( SVN_SOURCE_FILES )
 		}
 	} );
 
-gulp.task( 'svn', () => copyPlugin( config.svn_target ) );
+gulp.task( 'svn', () => copyPlugin( config.svn_target, () => console.log( 'SVN exported to ' + config.svn_target ) ) );
 
 gulp.task( 'export', () => {
 	const zipTarget = path.resolve( config.export_target, '..' );
 	const zipName = 'redirection-' + pkg.version + '.zip';
 
-	console.log( 'Exporting: ' + zipName );
+	console.log( 'Exporting: ' + zipName + ' to ' + config.export_target );
 
 	return copyPlugin( config.export_target, () => {
 		return gulp.src( config.export_target + '/**', { base: path.join( config.export_target, '..' ) } )

diff --git a/models/fixer.php b/models/fixer.php
@@ -52,8 +52,8 @@ private function get_http_settings() {
 
 		$message = __( 'Site and home are consistent', 'redirection' );
 		if ( $site !== $home ) {
-			$message = __( 'Site and home URL are inconsistent - please correct from your General settings', 'redirection' );
-			$message .= ' - ' . get_site_url() . ' !== ' . get_home_url();
+			/* translators: 1: Site URL, 2: Home URL */
+			$message = sprintf( __( 'Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s', 'redirection' ), get_site_url(), get_home_url() );
 		}
 
 		return array(

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redirection",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "Redirection is a WordPress plugin to manage 301 redirections and keep track of 404 errors without requiring knowledge of Apache .htaccess files.",
   "main": "redirection.php",
   "sideEffects": true,

diff --git a/readme.txt b/readme.txt
@@ -139,8 +139,10 @@ The plugin works in a similar manner to how WordPress handles permalinks and sho
 
 == Changelog ==
 
-= 3.6.2 - 7th November 2018 =
-* Add another PHP < 5.4 fix
+= 3.6.2 - 10th November 2018 =
+* Add another PHP < 5.4 compat fix
+* Fix 'delete all from 404 log' when ungrouped deleting all 404s
+* Fix IDs shown in bulk add redirect
 
 = 3.6.1 - 3rd November 2018 =
 * Add another PHP < 5.4 fix. Sigh

diff --git a/redirection-version.php b/redirection-version.php
@@ -1,5 +1,5 @@
 <?php
 
-define( 'REDIRECTION_VERSION', '3.6.1' );
-define( 'REDIRECTION_BUILD', '8ea8354f5e7d342d30bda3252bbf678c' );
+define( 'REDIRECTION_VERSION', '3.6.2' );
+define( 'REDIRECTION_BUILD', 'c5caa2378d690583dba6e3b650d87541' );
 define( 'REDIRECTION_MIN_WP', '4.5' );
diff --git a/redirection.js b/redirection.js
diff --git a/redirection.php b/redirection.php
@@ -3,7 +3,7 @@
 Plugin Name: Redirection
 Plugin URI: https://redirection.me/
 Description: Manage all your 301 redirects and monitor 404 errors
-Version: 3.6.1
+Version: 3.6.2
 Author: John Godley
 Author URI: https://johngodley.com
 Text Domain: redirection