From 3abfaa47766a0b6978f018cfc958370f838e4910 Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Sat, 29 Apr 2017 17:05:31 +0200
Subject: [PATCH] hotline #59686 fix action url opening in new tab when
accessing admin interface using https
---
library/ZendAfi/View/Helper/RenderModelActions.php | 2 +-
public/admin/js/onload_utils.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/library/ZendAfi/View/Helper/RenderModelActions.php b/library/ZendAfi/View/Helper/RenderModelActions.php
index dc73d44cb3c..531b78c7189 100644
--- a/library/ZendAfi/View/Helper/RenderModelActions.php
+++ b/library/ZendAfi/View/Helper/RenderModelActions.php
@@ -152,7 +152,7 @@ class ZendAfi_View_Helper_RenderModelAction {
return '';
return is_array($url)
- ? Class_Url::assemble($this->_injectIdIn($id, $url))
+ ? Class_Url::assemble($this->_injectIdIn($id, $url), null, false)
: $this->_injectId($id, $url);
}
diff --git a/public/admin/js/onload_utils.js b/public/admin/js/onload_utils.js
index d2ef3bd4f45..1248580ad1f 100644
--- a/public/admin/js/onload_utils.js
+++ b/public/admin/js/onload_utils.js
@@ -48,7 +48,7 @@ if (typeof jQuery != "undefined")
//Les liens qui référencent des sites externes doivent être ouverts dans un nouvel onglet
var setupAnchorsTarget = function() {
- var internalLink = new RegExp('/' + window.location.host + '/');
+ var internalLink = new RegExp('/' + window.location.host + '(:[0-9]+)?/');
$('a[href^="http"]').each(function() {
if (!internalLink.test($(this).attr('href'))
&& (undefined == this.onclick)
--
GitLab