Commit 831d2152 authored by Johan Cwiklinski's avatar Johan Cwiklinski

Merge branch '9.5/bugfixes'

parents 34a85bc1 12ebd5a6
......@@ -516,6 +516,8 @@ class Plugin extends CommonDBTM {
**/
function install($ID) {
global $DB;
$message = '';
$type = ERROR;
......@@ -530,6 +532,7 @@ class Plugin extends CommonDBTM {
$function = 'plugin_' . $this->fields['directory'] . '_install';
if (function_exists($function)) {
$this->setLoaded('temp', $this->fields['directory']); // For autoloader
$DB->disableTableCaching(); //prevents issues on table/fieldExists upgrading from old versions
if ($function()) {
$type = INFO;
$function = 'plugin_' . $this->fields['directory'] . '_check_config';
......
......@@ -411,7 +411,7 @@ class MySql extends AbstractDatabase
'FROM' => 'INFORMATION_SCHEMA.COLUMNS',
'WHERE' => [
'INFORMATION_SCHEMA.COLUMNS.TABLE_SCHEMA' => $DB->dbdefault,
'INFORMATION_SCHEMA.COLUMNS.COLUMN_TYPE' => ['DATETIME']
'INFORMATION_SCHEMA.COLUMNS.DATA_TYPE' => ['DATETIME']
]
])->next();
return (int)$result['cpt'];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment