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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

Browse Source 
develop

Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/website/index.php
This commit is contained in:
Laurent Destailleur 2017-11-18 22:19:15 +01:00
commit 9f5b73f4e2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/website/index.php
View File

@ -138,7 +138,6 @@ $upload_dir = $diroutput.'/'.$relativepath;
* Actions * Actions
*/ */
$backtopage=$_SERVER["PHP_SELF"].'?file_manager=1&website='.$website.'&pageid='.$pageid; // used after a confirm_deletefile into actions_linkedfiles.inc.php $backtopage=$_SERVER["PHP_SELF"].'?file_manager=1&website='.$website.'&pageid='.$pageid; // used after a confirm_deletefile into actions_linkedfiles.inc.php
include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
@ -1884,7 +1883,7 @@ if ($action == 'editfile' || $action == 'file_manager')
//print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>'; //print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
$module = 'medias'; $module = 'medias';
if (empty($url)) $url=DOL_URL_ROOT.'/website/index.php'; if (empty($url)) $url=DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
include DOL_DOCUMENT_ROOT.'/ecm/tpl/filemanager.tpl.php'; include DOL_DOCUMENT_ROOT.'/ecm/tpl/filemanager.tpl.php';
print '</div>'; print '</div>';