X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fwiki%2Ffarmconfig.php;h=617ebfbeb4b4546f48cb297870862442c5b9bb78;hb=3e993f7a0121316386f4ad51da79699d6b616e79;hp=b15491a524350ef87d49bf131d0e5841f3a396cf;hpb=de14933c384281bfc5571b8b3d7d7ac94b04bc48;p=platal.git
diff --git a/include/wiki/farmconfig.php b/include/wiki/farmconfig.php
index b15491a..617ebfb 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
@@ -96,16 +97,8 @@ function doBicol($column=false)
function doPlatalLink($link, $text)
{
if (strlen(trim($text)) == 0) {
- $res = XDB::query("SELECT u.nom, u.prenom, u.promo, q.profile_nick AS surnom
- FROM auth_user_md5 AS u
- INNER JOIN auth_user_quick AS q USING(user_id)
- INNER JOIN aliases AS a ON u.user_id = a.id
- WHERE a.alias = {?}", $link);
- $row = $res->fetchOneAssoc();
- $text = $row['prenom'] . ' ' . $row['nom'] . ' X' . $row['promo'];
- if ($row['surnom']) {
- $text .= ' (alias ' . $row['surnom'] . ')';
- }
+ $user = User::get($link);
+ $text = $user->fullName();
}
return '';
}