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

Clean path dolibarr_main_url_root to avoid duplicate /.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-06 00:06:27 +02:00
parent 0397fa7dc3
commit 0514fa02d5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/conf/conf.php.example
View File

@ -12,8 +12,8 @@
//################### //###################
// dolibarr_main_url_root // dolibarr_main_url_root
// This parameter defines the root URL of your Dolibarr index.php page. // This parameter defines the root URL of your Dolibarr index.php page without ending "/".
// It must link to the htdocs directory htdocs. // It must link to the directory htdocs.
// In most cases, this is autodetected but it's still required // In most cases, this is autodetected but it's still required
// * to show full url bookmarks for some services (ie: agenda rss export url, ...) // * to show full url bookmarks for some services (ie: agenda rss export url, ...)
// * or when using Apache dir aliases (autodetect fails) // * or when using Apache dir aliases (autodetect fails)

2
htdocs/filefunc.inc.php
View File

@ -92,7 +92,7 @@ if (! empty($dolibarr_main_prod)) ini_set('display_errors','Off');
// Clean parameters // Clean parameters
$dolibarr_main_data_root=trim($dolibarr_main_data_root); $dolibarr_main_data_root=trim($dolibarr_main_data_root);
$dolibarr_main_url_root=trim($dolibarr_main_url_root); $dolibarr_main_url_root=trim(preg_replace('/\/+$/','',$dolibarr_main_url_root));
$dolibarr_main_url_root_alt=(empty($dolibarr_main_url_root_alt)?'':trim($dolibarr_main_url_root_alt)); $dolibarr_main_url_root_alt=(empty($dolibarr_main_url_root_alt)?'':trim($dolibarr_main_url_root_alt));
$dolibarr_main_document_root=trim($dolibarr_main_document_root); $dolibarr_main_document_root=trim($dolibarr_main_document_root);
$dolibarr_main_document_root_alt=(empty($dolibarr_main_document_root_alt)?'':trim($dolibarr_main_document_root_alt)); $dolibarr_main_document_root_alt=(empty($dolibarr_main_document_root_alt)?'':trim($dolibarr_main_document_root_alt));