[CORE] MySQL 5.5 support fully restored

diff --git a/lib/framework.php b/lib/framework.php
index 11ee65ea3e1502bfe1559a8ff26a8fdb4351eb63..9c93ac2283e6d16b2090e4484df069d7338d5f4d 100644 (file)
--- 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 bd5c6899fdd004cb31d557dfc8c5359edf57780f..48148b015cefab012e6120b26eb4af90d0405c60 100644 (file)
--- 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 e1278f76b53a5a7761e8e734a8e421792274c2a8..ae0b9e2fbfcfd4b814034472b8ba5f8428272d94 100644 (file)
--- 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'],