updated drupal core to 7.43
This commit is contained in:
@@ -350,7 +350,7 @@ Drupal.overlay.setFocusBefore = function ($element, document) {
|
||||
* TRUE if the URL represents an administrative link, FALSE otherwise.
|
||||
*/
|
||||
Drupal.overlay.isAdminLink = function (url) {
|
||||
if (Drupal.overlay.isExternalLink(url)) {
|
||||
if (!Drupal.urlIsLocal(url)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -378,6 +378,8 @@ Drupal.overlay.isAdminLink = function (url) {
|
||||
/**
|
||||
* Determine whether a link is external to the site.
|
||||
*
|
||||
* Deprecated. Use Drupal.urlIsLocal() instead.
|
||||
*
|
||||
* @param url
|
||||
* The URL to be tested.
|
||||
*
|
||||
@@ -385,8 +387,7 @@ Drupal.overlay.isAdminLink = function (url) {
|
||||
* TRUE if the URL is external to the site, FALSE otherwise.
|
||||
*/
|
||||
Drupal.overlay.isExternalLink = function (url) {
|
||||
var re = RegExp('^((f|ht)tps?:)?//(?!' + window.location.host + ')');
|
||||
return re.test(url);
|
||||
return !Drupal.urlIsLocal(url);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -405,7 +406,7 @@ Drupal.overlay.isExternalLink = function (url) {
|
||||
*/
|
||||
Drupal.overlay.getInternalUrl = function (path) {
|
||||
var url = Drupal.settings.basePath + path;
|
||||
if (!this.isExternalLink(url)) {
|
||||
if (Drupal.urlIsLocal(url)) {
|
||||
return url;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -4,8 +4,8 @@ package = Core
|
||||
version = VERSION
|
||||
core = 7.x
|
||||
|
||||
; Information added by Drupal.org packaging script on 2015-08-19
|
||||
version = "7.39"
|
||||
; Information added by Drupal.org packaging script on 2016-02-24
|
||||
version = "7.43"
|
||||
project = "drupal"
|
||||
datestamp = "1440020197"
|
||||
datestamp = "1456343506"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user