From de3eb1d7f990c4cc17722ce3bdff7b9568ab8b9c Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Tue, 28 Sep 2010 16:38:14 +0200
Subject: Small fixes / cleanup

---
 inc/common.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'inc/common.php')

diff --git a/inc/common.php b/inc/common.php
index bf5987c28..003546409 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -97,7 +97,6 @@ function pageinfo(){
     global $REV;
     global $RANGE;
     global $USERINFO;
-    global $conf;
     global $lang;
 
     // include ID & REV not redundant, as some parts of DokuWiki may temporarily change $ID, e.g. p_wiki_xhtml
-- 
cgit v1.2.3


From 341f60512614ff9a4ad206e33369aa199b3f1330 Mon Sep 17 00:00:00 2001
From: Gina Haeussge <gina@foosel.net>
Date: Sat, 2 Oct 2010 19:33:58 +0200
Subject: FS#1928: Keep mlist file upon page deletion to persist subscribers
 for later recreation and allow notification of subscribers of page deletion.

---
 inc/common.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'inc/common.php')

diff --git a/inc/common.php b/inc/common.php
index 003546409..390b038a5 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -987,9 +987,10 @@ function saveWikiText($id,$text,$summary,$minor=false){
         $mfiles = metaFiles($id);
         $changelog = metaFN($id, '.changes');
         $metadata  = metaFN($id, '.meta');
+        $subscribers = metaFN($id, '.mlist');
         foreach ($mfiles as $mfile) {
-            // but keep per-page changelog to preserve page history and keep meta data
-            if (@file_exists($mfile) && $mfile!==$changelog && $mfile!==$metadata) { @unlink($mfile); }
+            // but keep per-page changelog to preserve page history, keep subscriber list and keep meta data
+            if (@file_exists($mfile) && $mfile!==$changelog && $mfile!==$metadata && $mfile!==$subscribers) { @unlink($mfile); }
         }
         // purge meta data
         p_purge_metadata($id);
-- 
cgit v1.2.3


From 060ab504d26b1044e946e7674201fa54f8ffb184 Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Sun, 3 Oct 2010 15:51:21 +0200
Subject: Truncate wiki name in sent mail (FS#2021)

---
 inc/common.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'inc/common.php')

diff --git a/inc/common.php b/inc/common.php
index 390b038a5..6af7f49de 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1128,7 +1128,11 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){
         $diff = rawWiki($id);
     }
     $text = str_replace('@DIFF@',$diff,$text);
-    $subject = '['.$conf['title'].'] '.$subject;
+    if(utf8_strlen($conf['title']) < 20) {
+        $subject = '['.$conf['title'].'] '.$subject;
+    }else{
+        $subject = '['.utf8_substr($conf['title'], 0, 20).'...] '.$subject;
+    }
 
     $from = $conf['mailfrom'];
     $from = str_replace('@USER@',$_SERVER['REMOTE_USER'],$from);
-- 
cgit v1.2.3