summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/common.php14
-rw-r--r--inc/html.php6
2 files changed, 8 insertions, 12 deletions
diff --git a/inc/common.php b/inc/common.php
index 99fa381bc..c478fb35a 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -582,7 +582,6 @@ function dbg($msg,$hidden=false){
*/
function addLogEntry($date,$id,$summary=""){
global $conf;
- $id = cleanID($id);//FIXME not needed anymore?
if(!@is_writable($conf['changelog'])){
msg($conf['changelog'].' is not writable!',-1);
@@ -594,13 +593,7 @@ function addLogEntry($date,$id,$summary=""){
$user = $_SERVER['REMOTE_USER'];
$logline = join("\t",array($date,$remote,$id,$user,$summary))."\n";
-
- //FIXME: use adjusted io_saveFile instead
- $fh = fopen($conf['changelog'],'a');
- if($fh){
- fwrite($fh,$logline);
- fclose($fh);
- }
+ io_saveFile($conf['changelog'],$logline,true);
}
/**
@@ -611,7 +604,7 @@ function addLogEntry($date,$id,$summary=""){
*
* @author Andreas Gohr <andi@splitbrain.org>
*/
-function getRecents($first,$num,$incdel=false){
+function getRecents($first,$num,$incdel=false,$ns=''){
global $conf;
$recent = array();
$names = array();
@@ -636,6 +629,9 @@ function getRecents($first,$num,$incdel=false){
(@file_exists(wikiFN($info[2])) || $incdel) &&
(auth_quickaclcheck($info[2]) >= AUTH_READ)
){
+ // filter namespace
+ if (($ns) && (strpos($info[2],$ns.':') !== 0)) continue;
+
$names[$info[2]] = 1;
if(--$first >= 0) continue; /* skip "first" entries */
diff --git a/inc/html.php b/inc/html.php
index 3078ff838..dcd11feb1 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -450,15 +450,15 @@ function html_revisions(){
function html_recent($first=0){
global $conf;
global $lang;
-
+ global $ID;
/* we need to get one additionally log entry to be able to
* decide if this is the last page or is there another one.
* This is the cheapest solution to get this information.
*/
- $recents = getRecents($first,$conf['recent'] + 1,true);
+ $recents = getRecents($first,$conf['recent'] + 1,true,getNS($ID));
if(count($recents) == 0 && $first != 0){
$first=0;
- $recents = getRecents(0,$conf['recent'] + 1,true);
+ $recents = getRecents(0,$conf['recent'] + 1,true,getNS($ID));
}
$cnt = count($recents) <= $conf['recent'] ? count($recents) : $conf['recent'];