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

FIX No js if javascript off

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-26 15:05:29 +01:00
parent 4a516a0352
commit 91e7ff3c8e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/main.inc.php
View File

@ -1876,7 +1876,7 @@ function top_menu_user()
</div> </div>
</div>'; </div>';
if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) // This may be set by some pages that use different jquery version to avoid errors if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax)) // This may be set by some pages that use different jquery version to avoid errors
{ {
$btnUser .= ' $btnUser .= '
<!-- Code to show/hide the user drop-down --> <!-- Code to show/hide the user drop-down -->
@ -1919,7 +1919,9 @@ function top_menu_bookmark()
$html = ''; $html = '';
// Define $bookmarks // Define $bookmarks
if (!empty($conf->bookmark->enabled) && $user->rights->bookmark->lire) if (empty($conf->bookmark->enabled) || empty($user->rights->bookmark->lire)) return $html;
if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax)) // This may be set by some pages that use different jquery version to avoid errors
{ {
include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php'; include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
$langs->load("bookmarks"); $langs->load("bookmarks");