From d1fc7c0774b4b8883f90c0202c67285ef34be322 Mon Sep 17 00:00:00 2001 From: Diogo Cordeiro Date: Thu, 25 Jul 2019 15:35:24 +0100 Subject: [PATCH] [CORE] MySQL 5.5 support fully restored --- lib/framework.php | 2 +- plugins/Nodeinfo/classes/Usage_stats.php | 2 +- plugins/OpenID/classes/User_openid_prefs.php | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/framework.php b/lib/framework.php index 11ee65ea3e..9c93ac2283 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -32,7 +32,7 @@ defined('GNUSOCIAL') || die(); define('GNUSOCIAL_ENGINE', 'GNU social'); define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/'); -define('GNUSOCIAL_BASE_VERSION', '1.20.6'); +define('GNUSOCIAL_BASE_VERSION', '1.20.7'); define('GNUSOCIAL_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); diff --git a/plugins/Nodeinfo/classes/Usage_stats.php b/plugins/Nodeinfo/classes/Usage_stats.php index bd5c6899fd..48148b015c 100644 --- a/plugins/Nodeinfo/classes/Usage_stats.php +++ b/plugins/Nodeinfo/classes/Usage_stats.php @@ -43,7 +43,7 @@ class Usage_stats extends Managed_DataObject 'fields' => [ 'type' => ['type' => 'varchar', 'length' => 191, 'description' => 'Type of countable entity'], 'count' => ['type' => 'int', 'size' => 'int', 'default' => 0, 'description' => 'Number of entities of this type'], - 'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], + 'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'], ], 'primary key' => ['type'], 'unique keys' => [ diff --git a/plugins/OpenID/classes/User_openid_prefs.php b/plugins/OpenID/classes/User_openid_prefs.php index e1278f76b5..ae0b9e2fbf 100644 --- a/plugins/OpenID/classes/User_openid_prefs.php +++ b/plugins/OpenID/classes/User_openid_prefs.php @@ -51,7 +51,7 @@ class User_openid_prefs extends Managed_DataObject public $user_id; // The User with the prefs public $hide_profile_link; // Hide the link on the profile block? public $created; // datetime - public $modified; // datetime + public $modified; // timestamp /** * The One True Thingy that must be defined and declared. @@ -77,13 +77,11 @@ class User_openid_prefs extends Managed_DataObject 'type' => 'datetime', 'not null' => true, 'description' => 'date this record was created', - 'default' => 'CURRENT_TIMESTAMP' ], 'modified' => [ 'type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified', - 'default' => 'CURRENT_TIMESTAMP' ], ], 'primary key' => ['user_id'],