fix typecho#635

fix typecho#634 fix typecho#633
gusha915 · Oct 29, 2017 · 93bcd46 · 93bcd46
1 parent a214977
commit 93bcd46
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/install.php b/install.php
@@ -536,6 +536,16 @@ function _u() {
                                 }
 
                                 if($success) {
+                                    // 重置原有数据库状态
+                                    if (isset($installDb)) {
+                                        try {
+                                            $installDb->query($installDb->update('table.options')
+                                                ->rows(array('value' => 0))->where('name = ?', 'installed'));
+                                        } catch (Exception $e) {
+                                            // do nothing
+                                        }
+                                    }
+
                                     Typecho_Cookie::set('__typecho_config', base64_encode(serialize(array_merge(array(
                                         'prefix'    =>  _r('dbPrefix'),
                                         'userName'  =>  _r('userName'),

diff --git a/var/Typecho/Date.php b/var/Typecho/Date.php
@@ -127,6 +127,6 @@ public static function gmtTime()
      */
     public static function time()
     {
-        return self::$serverTimeStamp ? self::$serverTimeStamp : (self::$serverTimeStamp = time() - idate('Z'));
+        return self::$serverTimeStamp ? self::$serverTimeStamp : (self::$serverTimeStamp = time());
     }
 }
diff --git a/var/Typecho/Db/Adapter/Mysqli.php b/var/Typecho/Db/Adapter/Mysqli.php
@@ -31,7 +31,7 @@ class Typecho_Db_Adapter_Mysqli implements Typecho_Db_Adapter
      */
     public static function isAvailable()
     {
-        return extension_loaded('mysqli');
+        return class_exists('MySQLi');
     }
 
     /**

diff --git a/var/Typecho/Db/Adapter/Pdo.php b/var/Typecho/Db/Adapter/Pdo.php
@@ -39,7 +39,7 @@ abstract class Typecho_Db_Adapter_Pdo implements Typecho_Db_Adapter
      */
     public static function isAvailable()
     {
-        return extension_loaded('pdo');
+        return class_exists('PDO');
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ class Typecho_Db_Adapter_Mysqli implements Typecho_Db_Adapter @@
          */
         public static function isAvailable()
         {
-            return extension_loaded('mysqli');
+            return class_exists('MySQLi');
         }
         /**
@@ Expand Down @@