From 510aff0e2d9446ad1f4f55c86e683431e7151d23 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Sun, 28 Jun 2015 23:06:14 +0000
Subject: [PATCH] wpLink: always attempt to correct the URL before getting the
 URL field value. Fixes an edge case where the URL was not corrected when the
 user submitted the form by pressing Enter. Props andfinally. Fixes #32412.

git-svn-id: https://develop.svn.wordpress.org/trunk@32992 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/wplink.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/wp-includes/js/wplink.js b/src/wp-includes/js/wplink.js
index 4585ca02a2..bc4cbd794e 100644
--- a/src/wp-includes/js/wplink.js
+++ b/src/wp-includes/js/wplink.js
@@ -77,20 +77,21 @@ var wpLink;
 				}, 500 );
 			});
 
-			function correctURL() {
-				var url = $.trim( inputs.url.val() );
-
-				if ( url && correctedURL !== url && ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( url ) ) {
-					inputs.url.val( 'http://' + url );
-					correctedURL = url;
-				}
-			}
-
 			inputs.url.on( 'paste', function() {
-				setTimeout( correctURL, 0 );
+				setTimeout( wpLink.correctURL, 0 );
 			} );
 
-			inputs.url.on( 'blur', correctURL );
+			inputs.url.on( 'blur', wpLink.correctURL );
+		},
+
+		// If URL wasn't corrected last time and doesn't start with http:, https:, ? # or /, prepend http://
+		correctURL: function () {
+			var url = $.trim( inputs.url.val() );
+
+			if ( url && correctedURL !== url && ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( url ) ) {
+				inputs.url.val( 'http://' + url );
+				correctedURL = url;
+			}
 		},
 
 		open: function( editorId ) {
@@ -267,6 +268,8 @@ var wpLink;
 		},
 
 		getAttrs: function() {
+			wpLink.correctURL();
+
 			return {
 				href: $.trim( inputs.url.val() ),
 				target: inputs.openInNewTab.prop( 'checked' ) ? '_blank' : ''