X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fwiki%2Ffarmconfig.php;h=d62c5c79299d4399f9546bcf49c04c94c3482b96;hb=c9653a577cf8df1652e439a875422801de779b6d;hp=081a9ed5452ef517a488043d18059b8255aef4c7;hpb=90489c0747738c9062379e810e4c72e5b222b680;p=platal.git

diff --git a/include/wiki/farmconfig.php b/include/wiki/farmconfig.php
index 081a9ed..d62c5c7 100644
--- a/include/wiki/farmconfig.php
+++ b/include/wiki/farmconfig.php
@@ -18,12 +18,16 @@ $InterMapFiles[]  = $globals->spoolroot.'/configs/pmwiki.intermap.txt';
 $Skin             = 'empty';
 
 @include_once("$FarmD/cookbook/e-protect.php");
-include_once($FarmD.'/scripts/xlpage-utf-8.php');
-
-if ($action == 'rss'  ||
-    $action == 'atom' ||
-    $action == 'rdf'  ||
-    $action == 'dc') include_once("$FarmD/scripts/feeds.php");
+include_once($FarmD.'/scripts/xlpage-utf-8.php'); 
+
+if ($action == 'rss'  || $action == 'atom' || $action == 'rdf'  || $action == 'dc') {
+    $FmtPV['$MarkupExcerpt'] = '$page["text"]';
+    $FeedFmt[$action]['item']['title'] = '[$Group] {$Title}';
+    $FeedFmt[$action]['item']['description'] = '$LastModifiedSummary';
+    $FeedFmt[$action]['feed']['title'] = 'Polytechnique.org :: Wiki :: $FullName';
+    $pagelist = null;
+    include_once("$FarmD/scripts/feeds.php");
+}
 
 // Theme-ing {{{
 
@@ -60,6 +64,10 @@ $InputTags['e_form'] = array(
 Markup('[[~platal', '<[[~', '/\[\[~([^|\]]*)(?:\|([^\]]*))?\]\]/e',
     'PreserveText("=", doPlatalLink("$1", "$2"), "")');
 
+// Preserve javascript
+Markup('[[javascript', '<[[javascript:', '/\[\[javascript:([^\|]*)\|([^\]]*)?\]\]/e',
+       'PreserveText("=", \'<a href="javascript:\' . htmlentities("$1") . \'">\', "") . "$2" . PreserveText("=", "</a>", "")');
+
 // prevent restorelinks before block apply (otherwise [[Sécurité]] will give
 //  .../S<span class='e9curit'>e9'>Sécurité</a>
 Markup('restorelinks','<%%',"//", '');