X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fwiki%2Ffarmconfig.php;h=2faf4f940d9ccf46d27eb46a48934678083d623f;hb=0a7895a33d0aa761b00a5df06b7f775455782669;hp=8a0f9a382bda4e9be3550556aef49bdab7fddb4c;hpb=a6391000e89c59f3c26d1a62bb06857df706bf50;p=platal.git
diff --git a/include/wiki/farmconfig.php b/include/wiki/farmconfig.php
index 8a0f9a3..2faf4f9 100644
--- a/include/wiki/farmconfig.php
+++ b/include/wiki/farmconfig.php
@@ -6,6 +6,7 @@ $EnableUpload = 1;
$UploadMaxSize = 500000;
$LinkWikiWords = 0; # disable WikiWord links
$EnableIMSCaching = 1; # allow browser caching
+$EnablePageListProtect = 0; # We use our own permission system.
$ScriptUrl = '.'; #\
$UploadUrlFmt = './uploads'; # } works thanks to the in skin
@@ -19,7 +20,7 @@ $Skin = 'empty';
@include_once("$FarmD/cookbook/e-protect.php");
include_once($FarmD.'/scripts/xlpage-utf-8.php');
-ResolvePageName();
+$pagename = ResolvePageName($pagename);
if ($action == 'rss' || $action == 'atom' || $action == 'rdf' || $action == 'dc') {
$FmtPV['$MarkupExcerpt'] = '$page["text"]';
@@ -96,8 +97,11 @@ function doBicol($column=false)
function doPlatalLink($link, $text)
{
if (strlen(trim($text)) == 0) {
- $user = User::get($link);
- $text = $user->fullName();
+ $profile = Profile::get($link);
+ if (!$profile) {
+ return '##Utilisateur inconnu##' . $text . '##';
+ }
+ $text = $profile->fullName();
}
return '';
}