sforkowany z mirror/friendica
Replace more is_null with empty in DBStructure
rodzic
e7d6b48bb3
commit
79ff49d716
|
@ -413,7 +413,7 @@ class DBStructure
|
|||
$field_definition = $database[$name]["fields"][$fieldname];
|
||||
|
||||
// Define the default collation if not given
|
||||
if (!isset($parameters['Collation']) && !is_null($field_definition['Collation'])) {
|
||||
if (!isset($parameters['Collation']) && !empty($field_definition['Collation'])) {
|
||||
$parameters['Collation'] = 'utf8mb4_general_ci';
|
||||
} else {
|
||||
$parameters['Collation'] = null;
|
||||
|
@ -580,7 +580,7 @@ class DBStructure
|
|||
}
|
||||
}
|
||||
|
||||
if (!is_null($structure["indexes"])) {
|
||||
if (!empty($structure["indexes"])) {
|
||||
foreach ($structure["indexes"] AS $indexname => $fieldnames) {
|
||||
$sql_index = self::createIndex($indexname, $fieldnames, "");
|
||||
if (!is_null($sql_index)) {
|
||||
|
@ -589,11 +589,11 @@ class DBStructure
|
|||
}
|
||||
}
|
||||
|
||||
if (!is_null($structure["engine"])) {
|
||||
if (!empty($structure["engine"])) {
|
||||
$engine = " ENGINE=" . $structure["engine"];
|
||||
}
|
||||
|
||||
if (!is_null($structure["comment"])) {
|
||||
if (!empty($structure["comment"])) {
|
||||
$comment = " COMMENT='" . dbesc($structure["comment"]) . "'";
|
||||
}
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue