Merge branch 'master' of git@github.com:splitbrain/dokuwiki

dokuwiki · Oct 3, 2010 · c34bbd2 · c34bbd2
2 parents 6d58f78 + 060ab50
commit c34bbd2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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);