Merge branch 'master' of https://github.com/devcode-it/openstamanager
This commit is contained in:
commit
b042c567ef
7
core.php
7
core.php
|
@ -265,6 +265,9 @@ if (!API\Response::isAPIRequest()) {
|
|||
}
|
||||
|
||||
Permissions::check();
|
||||
|
||||
// Impostazione della lingua
|
||||
App::setLang(setting('Lingua'));
|
||||
}
|
||||
|
||||
// Retrocompatibilità
|
||||
|
@ -302,8 +305,4 @@ foreach ($custom_files as $key => $value) {
|
|||
$list = array_merge($files, $custom_files);
|
||||
foreach ($list as $file) {
|
||||
include_once $file;
|
||||
}
|
||||
|
||||
if (database()->tableExists('zz_settings')) {
|
||||
App::setLang(setting('Lingua'));
|
||||
}
|
|
@ -230,7 +230,7 @@ class Query
|
|||
|
||||
if ($anno != '' && $giorno != '' && $mese != '') {
|
||||
if ($data != "'1970-01-01'") {
|
||||
$search_filters[] = $search_query.' = '.$data.'';
|
||||
$search_filters[] = 'date('.$search_query.') = '.$data.'';
|
||||
}
|
||||
} else {
|
||||
$search_filters[] = ($search_query.' = '.prepare($value).' OR '.$search_query.' LIKE '.prepare('% '.$value).' OR '.$search_query.' LIKE '.prepare($value.' %').' OR '.$search_query.' LIKE '.prepare('% '.$value.' %'));
|
||||
|
|
Loading…
Reference in New Issue