URL is not a scheme (#17631)

* url is not a valid scheme * url is not a scheme * codestyle * codestyle * space * make drone happy * remove one tab
joomla · Aug 21, 2017 · 9bef947 · 9bef947
1 parent f0b4080
commit 9bef947
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/administrator/components/com_menus/controllers/item.php b/administrator/components/com_menus/controllers/item.php
@@ -336,8 +336,8 @@ public function save($key = null, $urlVar = null)
 			{
 				$segments = explode(':', $data['link']);
 				$protocol = strtolower($segments[0]);
-				$scheme = array('http', 'https', 'ftp', 'ftps', 'gopher', 'mailto', 'news', 'prospero', 'telnet', 'rlogin', 'tn3270', 'wais', 'url',
-					'mid', 'cid', 'nntp', 'tel', 'urn', 'ldap', 'file', 'fax', 'modem', 'git', 'sms');
+				$scheme = array('http', 'https', 'ftp', 'ftps', 'gopher', 'mailto', 'news', 'prospero', 'telnet', 'rlogin', 'tn3270', 'wais','mid', 'cid', 'nntp',
+					 'tel', 'urn', 'ldap', 'file', 'fax', 'modem', 'git', 'sms');
 
 				if (!in_array($protocol, $scheme))
 				{

diff --git a/libraries/src/Form/Rule/UrlRule.php b/libraries/src/Form/Rule/UrlRule.php
@@ -56,7 +56,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
 		// Use the full list or optionally specify a list of permitted schemes.
 		if ($element['schemes'] == '')
 		{
-			$scheme = array('http', 'https', 'ftp', 'ftps', 'gopher', 'mailto', 'news', 'prospero', 'telnet', 'rlogin', 'sftp', 'tn3270', 'wais', 'url',
+			$scheme = array('http', 'https', 'ftp', 'ftps', 'gopher', 'mailto', 'news', 'prospero', 'telnet', 'rlogin', 'sftp', 'tn3270', 'wais', 
 				'mid', 'cid', 'nntp', 'tel', 'urn', 'ldap', 'file', 'fax', 'modem', 'git');
 		}
 		else

diff --git a/plugins/fields/url/params/url.xml b/plugins/fields/url/params/url.xml
@@ -13,7 +13,6 @@
 				<option value="https">HTTPS</option>
 				<option value="ftp">FTP</option>
 				<option value="ftps">FTPS</option>
-				<option value="url">URL</option>
 				<option value="file">FILE</option>
 				<option value="mailto">MAILTO</option>
 			</field>

diff --git a/plugins/fields/url/url.xml b/plugins/fields/url/url.xml
@@ -32,7 +32,6 @@
 					<option value="https">HTTPS</option>
 					<option value="ftp">FTP</option>
 					<option value="ftps">FTPS</option>
-					<option value="url">URL</option>
 					<option value="file">FILE</option>
 					<option value="mailto">MAILTO</option>
 				</field>