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

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

Browse Source 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/main.inc.php
This commit is contained in:
Laurent Destailleur 2019-12-03 15:03:10 +01:00
commit 7a1a932755
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/list.php
View File

@ -37,7 +37,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("users", "companies", "agenda", "commercial")); $langs->loadLangs(array("users", "companies", "agenda", "commercial", "other"));
$action = GETPOST('action', 'alpha'); $action = GETPOST('action', 'alpha');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search

2
htdocs/main.inc.php
View File

@ -232,7 +232,7 @@ require_once 'master.inc.php';
register_shutdown_function('dol_shutdown'); register_shutdown_function('dol_shutdown');
// Load debugbar // Load debugbar
if (!empty($conf->debugbar->enabled)) if (!empty($conf->debugbar->enabled) && ! GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile']))
{ {
global $debugbar; global $debugbar;
include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php'; include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';