From: web Date: Tue, 30 Jan 2007 14:37:23 +0000 (+0000) Subject: Migration fixes X-Git-Tag: xorg/0.9.13~36 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b7ce3cc73946b2ef7a64fe29724d1da7878624bd;p=platal.git Migration fixes -> Do not show GroupHeader in included wiki pages -> Fix DB upgrade -> Fix "Bandeau" icon -> Fix NL skin on validation page git-svn-id: svn+ssh://murphy/home/svn/platal/branches/platal-0.9.13@1435 839d8a87-29fc-0310-9880-83ba4fa771e5 --- diff --git a/include/banana/ml.inc.php b/include/banana/ml.inc.php index 8a42f30..04ffce5 100644 --- a/include/banana/ml.inc.php +++ b/include/banana/ml.inc.php @@ -40,6 +40,7 @@ class MLBanana extends Banana function __construct($params = null) { + global $globals; Banana::$spool_root = $globals->banana->spool_root; Banana::$spool_boxlist = false; Banana::$msgedit_canattach = true; diff --git a/modules/admin.php b/modules/admin.php index 09fe710..62c1d20 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -775,7 +775,8 @@ class AdminModule extends PLModule function handler_validate(&$page, $action = 'list', $id = null) { $page->changeTpl('admin/valider.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande'); - require_once("validations.inc.php"); + $page->addCssLink('nl.css'); + require_once("validations.inc.php"); if ($action == 'edit' and !is_null($id)) { $page->assign('preview_id', $id); diff --git a/templates/emails/antispam.tpl b/templates/emails/antispam.tpl index 452e482..d99a085 100644 --- a/templates/emails/antispam.tpl +++ b/templates/emails/antispam.tpl @@ -20,7 +20,7 @@ {* *} {**************************************************************************} -{include file=../spool/wiki.d/cache_Xorg.Antispam.tpl part=1} +{include file=../spool/wiki.d/cache_Xorg.Antispam.tpl part=1 included=1}
@@ -38,6 +38,6 @@
-{include file=../spool/wiki.d/cache_Xorg.Antispam.tpl part=2} +{include file=../spool/wiki.d/cache_Xorg.Antispam.tpl part=2 included=1} {* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/emails/broken.tpl b/templates/emails/broken.tpl index 5a590e5..f491edc 100644 --- a/templates/emails/broken.tpl +++ b/templates/emails/broken.tpl @@ -81,6 +81,6 @@ correspondant si tu veux que nous puissions te r -{include file=../spool/wiki.d/cache_Xorg.PatteCassée.tpl from=form} +{include file=../spool/wiki.d/cache_Xorg.PatteCassée.tpl included=1} {* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/emails/submit_spam.tpl b/templates/emails/submit_spam.tpl index 0d07720..8b37ea1 100644 --- a/templates/emails/submit_spam.tpl +++ b/templates/emails/submit_spam.tpl @@ -56,6 +56,6 @@
  • nonspam : pour soumettre un mail légitime mal reconnu
    • -{include file=../spool/wiki.d/cache_Xorg.Mails.tpl part=clients} +{include file=../spool/wiki.d/cache_Xorg.Mails.tpl part=clients included=1} {* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/newsletter/submit.tpl b/templates/newsletter/submit.tpl index a414d71..e8e84ac 100644 --- a/templates/newsletter/submit.tpl +++ b/templates/newsletter/submit.tpl @@ -122,7 +122,7 @@ Tu peux lire les conseils de r -{include file=../spool/wiki.d/cache_Xorg.LettreMensuelle.tpl public=1} +{include file=../spool/wiki.d/cache_Xorg.LettreMensuelle.tpl included=1} {/if} diff --git a/templates/platal/acces_smtp.tpl b/templates/platal/acces_smtp.tpl index 6ff9fa1..632e63f 100644 --- a/templates/platal/acces_smtp.tpl +++ b/templates/platal/acces_smtp.tpl @@ -105,12 +105,12 @@

    Pourquoi et comment utiliser le serveur SMTP de {#globals.core.sitename#}.

    -{include file=../spool/wiki.d/cache_Xorg.NNTPSécurisé.tpl from=form} +{include file=../spool/wiki.d/cache_Xorg.NNTPSécurisé.tpl included=1} {elseif $smarty.request.doc eq "smtp"}

    Pourquoi et comment utiliser le serveur NNTP de {#globals.core.sitename#}.

    -{include file=../spool/wiki.d/cache_Xorg.SMTPSécurisé.tpl from=form} +{include file=../spool/wiki.d/cache_Xorg.SMTPSécurisé.tpl included=1} {else}

    Pourquoi et comment utiliser le serveur SMTP de {#globals.core.sitename#}.
    diff --git a/templates/register/step0.tpl b/templates/register/step0.tpl index 57b0b20..a6ee8df 100644 --- a/templates/register/step0.tpl +++ b/templates/register/step0.tpl @@ -37,7 +37,7 @@ L'enregistrement se d -{include file=../spool/wiki.d/cache_Reference.Charte.tpl public=1} +{include file=../spool/wiki.d/cache_Reference.Charte.tpl public=1 included=1}

    diff --git a/templates/skin/common.bandeau.tpl b/templates/skin/common.bandeau.tpl index b4cf84b..26fbedc 100644 --- a/templates/skin/common.bandeau.tpl +++ b/templates/skin/common.bandeau.tpl @@ -31,7 +31,7 @@ {/if}
    - + L'École · Institutional site ˜˜ diff --git a/upgrade/0.9.13/01_tips.sql b/upgrade/0.9.13/01_tips.sql index d9c68ca..d68de24 100644 --- a/upgrade/0.9.13/01_tips.sql +++ b/upgrade/0.9.13/01_tips.sql @@ -6,7 +6,7 @@ create table tips ( peremption date not null default '0000-00-00', promo_min smallint(4) unsigned not null default 0, promo_max smallint(4) unsigned not null default 0, - active set('active') not null default 'active', + state set('active') not null default 'active', primary key (id) ); diff --git a/upgrade/0.9.13/07_logger.sql b/upgrade/0.9.13/07_logger.sql index 7ea86b0..40f367e 100644 --- a/upgrade/0.9.13/07_logger.sql +++ b/upgrade/0.9.13/07_logger.sql @@ -1,7 +1,7 @@ use logger; alter table sessions add column forward_ip varchar(64) default NULL; alter table sessions add column forward_host varchar(128) default NULL; -alter table sessions add column set('proxy') NOT NULL default ''; +alter table sessions add column flags set('proxy') NOT NULL default ''; alter table sessions add key(forward_ip); alter table sessions add key(ip); insert into actions (text, description) values ('view_page', 'Consultation d\'une page');