summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2010-10-03 15:34:58 +0100
committerChristopher Smith <chris@jalakai.co.uk>2010-10-03 15:34:58 +0100
commitc34bbd2f46f883ca3f961b2b21981ac53920958a (patch)
treea19b47a561e83a5a2c8d65fdfe766ef67be51280
parent6d58f7821f530c90900d3cda301f9e22026c5fcb (diff)
parent060ab504d26b1044e946e7674201fa54f8ffb184 (diff)
downloadrpg-c34bbd2f46f883ca3f961b2b21981ac53920958a.tar.gz
rpg-c34bbd2f46f883ca3f961b2b21981ac53920958a.tar.bz2
Merge branch 'master' of git@github.com:splitbrain/dokuwiki
-rw-r--r--inc/common.php6
1 files changed, 5 insertions, 1 deletions
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);