projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid access to member of non-objects.
[platal.git]
/
include
/
wiki
/
farmconfig.php
diff --git
a/include/wiki/farmconfig.php
b/include/wiki/farmconfig.php
index
8a0f9a3
..
2faf4f9
100644
(file)
--- 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
$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 <base /> in skin
$ScriptUrl = '.'; #\
$UploadUrlFmt = './uploads'; # } works thanks to the <base /> in skin
@@
-19,7
+20,7
@@
$Skin = 'empty';
@include_once("$FarmD/cookbook/e-protect.php");
include_once($FarmD.'/scripts/xlpage-utf-8.php');
@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"]';
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) {
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 '<a href="profile/' . $link . '" class="popup2">' . $text . '</a>';
}
}
return '<a href="profile/' . $link . '" class="popup2">' . $text . '</a>';
}