Merge branch 'platal-0.9.16'

diff --git a/templates/include/plview.geoloc.tpl b/templates/include/plview.geoloc.tpl
index cefa311..46789da 100644 (file)
--- a/templates/include/plview.geoloc.tpl
+++ b/templates/include/plview.geoloc.tpl
@@ -64,7 +64,7 @@ function searchMapId()
     height="450">
       <param name="movie" value="{$platal->ns}{$plset_base}/geoloc/dynamap.swf"/>
       <param name="wmode" value="transparent"/>
-      <param name="flashvars" value="initfile={$platal->ns}{$plset_base}/geoloc/init{$plset_search_enc}"/>
+      <param name="flashvars" value="initfile=init{$plset_search_enc}"/>
     </object>
   </p>
   {if $annu}

diff --git a/upgrade/0.9.16/04_ip.sql b/upgrade/0.9.16/04_ip.sql
index 85de602..ba8260f 100644 (file)
--- a/upgrade/0.9.16/04_ip.sql
+++ b/upgrade/0.9.16/04_ip.sql
@@ -37,7 +37,7 @@ ALTER TABLE ip_watch
 DROP PRIMARY KEY,
 DROP COLUMN ip,
 CHANGE COLUMN ip2 ip INT(11) UNSIGNED NOT NULL,
-ADD COLUMN mask uint(11) NOT NULL DEFAULT 4294967295,
+ADD COLUMN mask int(11) unsigned NOT NULL DEFAULT 4294967295,
 ADD PRIMARY KEY ip (ip),
 ADD INDEX network (ip, mask);
 

diff --git a/upgrade/0.9.16/08_forums.sql b/upgrade/0.9.16/08_forums.sql
index f208a2a..00af187 100644 (file)
--- a/upgrade/0.9.16/08_forums.sql
+++ b/upgrade/0.9.16/08_forums.sql
@@ -1,4 +1,6 @@
-CREATE TABLE `forums.innd` (
+USE forums;
+
+CREATE TABLE IF NOT EXISTS `innd` (
   `id_innd` int(10) unsigned NOT NULL auto_increment,
   `ipmin` int(10) unsigned default '0' COMMENT 'ip_address',
   `ipmax` int(10) unsigned default '4294967295' COMMENT 'ip_address',
@@ -10,4 +12,4 @@ CREATE TABLE `forums.innd` (
   PRIMARY KEY  (`id_innd`)
 ) DEFAULT CHARSET=utf8;
 
-INSERT INTO `forums.innd` VALUES (1,0,4294967295,NULL,'xorg.*,!xorg.prive.*','xorg.*,!xorg.prive.*,!xorg.pa.emploi',0,'par defaut pour tous');
+INSERT INTO `innd` VALUES (1,0,4294967295,NULL,'xorg.*,!xorg.prive.*','xorg.*,!xorg.prive.*,!xorg.pa.emploi',0,'par defaut pour tous');

diff --git a/upgrade/0.9.16/10_logger.sql b/upgrade/0.9.16/10_logger.sql
index ba3d58b..fab186d 100644 (file)
--- a/upgrade/0.9.16/10_logger.sql
+++ b/upgrade/0.9.16/10_logger.sql
@@ -2,9 +2,9 @@ INSERT INTO logger.actions (text, description)
      VALUES ('view_profile', 'Consultation d\'une fiche'),
             ('search', 'Réalisation d\'une recherche');
 
-user logger;
+use logger;
 ALTER TABLE events ADD INDEX action (action);
 
-user x4dat;
+use x4dat;
 
 # vim:set syntax=mysql: