X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fwiki.engine.inc.php;h=b26daa54fedcf4cc1b9f9202400c3e35ea3c13a8;hb=1547b0f6051a721ef80013d99f997dac1f819f84;hp=ae320400c14f1c6687ba576297ffb2aa5b568483;hpb=6cc34b5041e235805e37756b146b86a62f104e2a;p=platal.git

diff --git a/include/wiki.engine.inc.php b/include/wiki.engine.inc.php
index ae32040..b26daa5 100644
--- a/include/wiki.engine.inc.php
+++ b/include/wiki.engine.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -96,7 +96,7 @@ if ($feed) {
         file_put_contents($wiki_cache, $wikiAll);
     } elseif ($cache_exists) {
         $wikiAll = file_get_contents($wiki_cache);
-    } elseif (S::has_perms()) {
+    } elseif (S::admin()) {
         $wikiAll = "<p>La page de wiki $n n'existe pas. "
                  . "Il te suffit de <a href='" . str_replace('.', '/', $n) . "?action=edit'>l'éditer</a></p>";
     } else {
@@ -112,7 +112,7 @@ $page->assign('perms', array($wp->readPerms(), $wp->writePerms()));
 $page->assign('perms_opts', PlWikiPage::permOptions());
 
 $page->assign('canedit',    $wp->canWrite());
-$page->assign('has_perms',  S::has_perms());
+$page->assign('has_perms',  S::admin());
 
 $page->assign('wikipage', str_replace('.', '/', $n));
 if (!$feed && $wp->writePerms() == 'admin' && !Env::v('action') && $wiki_exists) {
@@ -126,12 +126,7 @@ $page->addJsLink('wiki.js');
 if (!Env::v('action')) {
     $url = '/' . str_replace('.', '/', $n) . '?action=rss';
     if (S::logged()) {
-        if (S::user()) {
-            $url .= '&user=' . S::user()->login() . '&hash=' . S::v('core_rss_hash');
-        } else {
-            // TODO(vzanotti): trash that code when forlife support will be gone.
-            $url .= '&user=' . S::v('forlife') . '&hash=' . S::v('core_rss_hash');
-        }
+        $url .= '&user=' . S::user()->login() . '&hash=' . S::v('core_rss_hash');
     }
     $page->setRssLink($n, $url);
 }