vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CI

Browse source
This commit is contained in:
ldestailleur 2025-04-08 22:33:15 +02:00
parent 6b11ed0187
commit 4f9e17e95a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
htdocs/core/frames.php
View file

@ -41,6 +41,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
* @var int $heightforframes
*/
/** @phan-file-suppress PhanUndeclaredGlobalVariable */
// Load translation files required by the page
$langs->load("other");
@ -105,7 +107,6 @@ if ($keyforcontent) {
} else {
if (preg_match('/^\//', $menu->url) || preg_match('/^http/i', $menu->url)) {
// menu->url is an URL starting with http or /
// @phan-suppress PhanUndeclaredMethod
print "
<html>
<head>

5
htdocs/core/menus/standard/auguria.lib.php
View file

@ -25,6 +25,7 @@
*/
require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
/** @phan-file-suppress PhanTypeInvalidDimOffset */
/**
* Core function to output top menu auguria
@ -108,10 +109,12 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
}
// Modify URL for the case we are using the option showtopmenuinframe
'@phan-var-force array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,showtopmenuinframe:int,level?:int,prefix:string}> $newTabMenu';
// @phan-suppress-next-line PhanTypeInvalidDimOffset
if ($newTabMenu[$i]['showtopmenuinframe']) {
if (preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) {
$url = $shorturl = '/core/frames.php?idmenu='.$newTabMenu[$i]['rowid'];
$url = '/core/frames.php?idmenu='.$newTabMenu[$i]['rowid'];
$shorturl = $url;
}
}