diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index d7d8ee5a5ee..02d1928cddf 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -377,7 +377,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
// select2 disabled for smartphones with standard browser.
// TODO With select2 v4, it seems ok, except that responsive style on table become crazy when scrolling at end of array)
- if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') return '';
+ if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone' && empty($conf->global->MAIN_ALLOW_SELECT2_WITH_SMARTPHONE)) return '';
if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
if (empty($conf->use_javascript_ajax)) return '';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1f0ff983c7d..70571964162 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1357,11 +1357,11 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print ''."\n";
if (defined('JS_JQUERY') && constant('JS_JQUERY')) print ''."\n";
else print ''."\n";
- if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
+ /*if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
{
if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print ''."\n";
else print ''."\n";
- }
+ }*/
if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print ''."\n";
else print ''."\n";
if (! defined('DISABLE_JQUERY_TABLEDND')) print ''."\n";
@@ -1762,8 +1762,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
{
foreach($arrayresult as $key => $val)
{
- //$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth100', 'sall', $val['shortcut'], 'searchleft', img_picto('',$val['img']));
- $searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft', img_picto('', $val['img'], '', false, 1, 1));
+ $searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, img_picto('', $val['img'], '', false, 1, 1));
}
}