lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24034 from grandoc/new_branch_24_02_2023

Browse Source 
fix : Warning: Constant DOL_URL_ROOT already defined in /home/httpd/v…
This commit is contained in:
Laurent Destailleur 2023-02-24 18:03:24 +01:00 committed by GitHub
commit 0ddfb9ce33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/filemanagerdol/browser/default/browser.php
View File

@ -49,6 +49,7 @@ if (!empty($conf->modules_parts['theme'])) { // This slow down
} }
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit; //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
$themeparam = '';
print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n"; print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
?> ?>
<script type="text/javascript" src="js/fckxml.js"></script> <script type="text/javascript" src="js/fckxml.js"></script>

2
htdocs/core/filemanagerdol/connectors/php/config.inc.php
View File

@ -37,7 +37,7 @@ $pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine
if ($pos == '/') { if ($pos == '/') {
$pos = ''; // si $pos vaut /, on le met a '' $pos = ''; // si $pos vaut /, on le met a ''
} }
define('DOL_URL_ROOT', $pos); //define('DOL_URL_ROOT', $pos);
$entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null); $entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null);
// SECURITY: You must explicitly enable this "connector". (Set it to "true"). // SECURITY: You must explicitly enable this "connector". (Set it to "true").