diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-03-20 08:25:33 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-03-20 08:25:33 +0000 |
| commit | acfb81d940a50ec018613946e30f63c623b8c5db (patch) | |
| tree | 1cbdd3427c758e0740a836011ee32a50993fccb7 | |
| parent | 6df1dffed1e2eef2690444e044c2adb1a9bbca51 (diff) | |
Oops, we need UNIX_TIMESTAMP() instead of NOW()
| -rw-r--r-- | core/controllers/scaffold.php | 2 | ||||
| -rw-r--r-- | installer/install.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/controllers/scaffold.php b/core/controllers/scaffold.php index f3f3605b..6c71ae27 100644 --- a/core/controllers/scaffold.php +++ b/core/controllers/scaffold.php @@ -342,7 +342,7 @@ class Scaffold_Controller extends Template_Controller { $line); // Normalize dates - $line = preg_replace("/,$root_timestamp,/", ",NOW(),", $line); + $line = preg_replace("/,$root_timestamp,/", ",UNIX_TIMESTAMP(),", $line); $buf .= $line; } $fd = fopen($sql_file, "wb"); diff --git a/installer/install.sql b/installer/install.sql index d8f6017c..9b1b40f3 100644 --- a/installer/install.sql +++ b/installer/install.sql @@ -147,7 +147,7 @@ CREATE TABLE {items} ( KEY `random` (`rand_key`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; -INSERT INTO {items} VALUES (NULL,NOW(),'',NULL,1,1,1,NULL,NULL,NULL,0,NULL,NULL,1,2,NULL,NULL,1,'Gallery','album',NOW(),0,NULL,NULL,'id','ASC',1,1); +INSERT INTO {items} VALUES (NULL,UNIX_TIMESTAMP(),'',NULL,1,1,1,NULL,NULL,NULL,0,NULL,NULL,1,2,NULL,NULL,1,'Gallery','album',UNIX_TIMESTAMP(),0,NULL,NULL,'id','ASC',1,1); DROP TABLE IF EXISTS {items_tags}; SET @saved_cs_client = @@character_set_client; SET character_set_client = utf8; |