GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[PostgreSQL] Set timezone to UTC

Browse Source 
And remove some redundant neighbouring cruft:
utf8mb4 is already set in mysqlschema more than enough times.
This commit is contained in:
Alexei Sorokin 2020-08-17 16:52:11 +03:00
parent be5bec9887
commit b01974b665
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/Memcached_DataObject.php
View File

@ -845,21 +845,11 @@ class Memcached_DataObject extends Safe_DataObject
$result = parent::_connect(); $result = parent::_connect();
if ($result && !$exists) { if ($result && !$exists) {
$DB = &$_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5];
if (common_config('db', 'type') == 'mysql' &&
common_config('db', 'utf8')) {
$conn = $DB->connection;
if (!empty($conn)) {
if ($DB instanceof DB_mysqli || $DB instanceof MDB2_Driver_mysqli) {
mysqli_set_charset($conn, 'utf8mb4');
} elseif ($DB instanceof DB_mysql || $DB instanceof MDB2_Driver_mysql) {
mysql_set_charset('utf8mb4', $conn);
}
}
}
// Needed to make timestamp values usefully comparable. // Needed to make timestamp values usefully comparable.
if (common_config('db', 'type') == 'mysql') { if (common_config('db', 'type') !== 'mysql') {
parent::_query("set time_zone='+0:00'"); parent::_query("SET TIME ZONE INTERVAL '+00:00' HOUR TO MINUTE");
} else {
parent::_query("SET time_zone = '+0:00'");
} }
} }