* Release XXV-1.1

4 files changed, 9 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 0424e4c..31872f9 100644
--- a/Makefile
+++ b/Makefile
@@ -55,8 +55,8 @@ updateversion:
 DBTABLES = $(shell cat ./contrib/update-xxv | grep tables= | cut -d '=' -f 2 | sed -e s/\'//g;)
 updatesql:
 	@echo Please type the DB-Password for root:
-	@mysqldump --skip-opt -u root -p -n -d --compatible=mysql40,no_table_options xxv $(DBTABLES) -r $(TMPDIR)/$(ARCHIVE)/contrib/upgrade-xxv-db.sql
-	@sed -e "s/CREATE TABLE/CREATE TABLE IF NOT EXISTS/g" $(TMPDIR)/$(ARCHIVE)/contrib/upgrade-xxv-db.sql > ./contrib/upgrade-xxv-db.sql
+	@mysqldump --add-drop-table=FALSE --set-charset=FALSE -u root -p -n -d xxv $(DBTABLES) -r $(TMPDIR)/$(ARCHIVE)/contrib/upgrade-xxv-db.sql
+	@sed -e "s/CREATE TABLE/CREATE TABLE IF NOT EXISTS/g" -e "s/\ ENGINE=MyISAM.*;/;/g" $(TMPDIR)/$(ARCHIVE)/contrib/upgrade-xxv-db.sql > ./contrib/upgrade-xxv-db.sql
 
 setpermission:
 	@find $(TMPDIR)/$(ARCHIVE) -type d -exec chmod 755 {} \;
diff --git a/contrib/upgrade-xxv-db.sql b/contrib/upgrade-xxv-db.sql
index 35e209c..5f13b19 100644
--- a/contrib/upgrade-xxv-db.sql
+++ b/contrib/upgrade-xxv-db.sql
@@ -7,7 +7,7 @@
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL40,NO_TABLE_OPTIONS' */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 --
@@ -60,7 +60,7 @@ CREATE TABLE IF NOT EXISTS `MEDIALIB_ACTORS` (
   `name` varchar(255) NOT NULL default '',
   `actorid` varchar(15) NOT NULL default '',
   `imgurl` varchar(255) NOT NULL default '',
-  `checked` timestamp NOT NULL,
+  `checked` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   PRIMARY KEY  (`name`)
 );
 
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS `MEDIALIB_VIDEODATA` (
   `video_width` int(10) unsigned default NULL,
   `video_height` int(10) unsigned default NULL,
   `istv` tinyint(1) unsigned NOT NULL default '0',
-  `lastupdate` timestamp NOT NULL,
+  `lastupdate` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   `seen` tinyint(1) unsigned NOT NULL default '0',
   `mediatype` int(10) unsigned NOT NULL default '0',
   `custom1` varchar(255) default NULL,
@@ -158,4 +158,4 @@ CREATE TABLE IF NOT EXISTS `USER` (
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2008-01-20 20:49:43
+-- Dump completed on 2008-02-03  8:59:16
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 025d52d..47eed7c 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,4 +1,4 @@
-1.. - Feature release
+1.1 - Feature release (Release candidate)
 --------------------------------------------------------------------------------
 
 Database:
diff --git a/lib/XXV/OUTPUT/Ajax.pm b/lib/XXV/OUTPUT/Ajax.pm
index 290c1eb..0d1b72e 100644
--- a/lib/XXV/OUTPUT/Ajax.pm
+++ b/lib/XXV/OUTPUT/Ajax.pm
@@ -136,8 +136,8 @@ sub printout {
     my $content;
     if($self->{browser}->{Method} ne 'HEAD') {
       if( $self->{outtype} eq 'json' ) {
-        if($self->{json}->can('to_json')) { # Version 2.0 see http://search.cpan.org/~makamaka/JSON-2.04/lib/JSON.pm#Transition_ways_from_1.xx_to_2.xx.
-          $content = $self->{json}->to_json($self->{output});
+        if($self->{json}->can('encode')) { # Version 2.0 see http://search.cpan.org/~makamaka/JSON-2.04/lib/JSON.pm#Transition_ways_from_1.xx_to_2.xx.
+          $content = $self->{json}->encode($self->{output});
         } else { # Version 1.0
           $content = $self->{json}->objToJson($self->{output});
         }