Fix trackback excerpt for multibyte chars, thanks to Hideki ONO from the forums!

diff --git a/include/functions_trackbacks.inc.php b/include/functions_trackbacks.inc.php
index 975b5b93552293e98138f5e1de15f36b4303b7bf..4425be3351295868f47d990a358b5016ba4d5535 100644 (file)
--- a/include/functions_trackbacks.inc.php
+++ b/include/functions_trackbacks.inc.php
@@ -334,7 +334,7 @@ function add_pingback ($id, $postdata) {
  * @return  string  Output text
  */
 function serendipity_trackback_excerpt($text) {
-    return substr(strip_tags($text), 0, 255);
+    return serendipity_mb('substr', strip_tags($text), 0, 255);
 }
 
 /**

diff --git a/plugins/serendipity_event_mailer/serendipity_event_mailer.php b/plugins/serendipity_event_mailer/serendipity_event_mailer.php
index 0f3969c0142dca885e1ec17a84a6280e6d71e151..21a8a14125516d0613413c31c86e4acbe197aa1a 100644 (file)
--- a/plugins/serendipity_event_mailer/serendipity_event_mailer.php
+++ b/plugins/serendipity_event_mailer/serendipity_event_mailer.php
@@ -60,8 +60,12 @@ class serendipity_event_mailer extends serendipity_event
     function introspect_config_item($name, &$propbag)
     {
         if (preg_match('@^category_([0-9]+)$@imsU', $name, $catid)) {
+            $parent = '';
+            if ($this->data['cat'][$catid[1]]['parentid'] > 0) {
+                $parent = " '" . $this->data['cat'][$this->data['cat'][$catid[1]]['parentid']]['category_name'] . "' -";
+            }
             $propbag->add('type',        'string');
-            $propbag->add('name',        CATEGORY . " '"  . $this->data['cat'][$catid[1]]['category_name'] . "'");
+            $propbag->add('name',        CATEGORY . $parent . " '"  . $this->data['cat'][$catid[1]]['category_name'] . "'");
             $propbag->add('description', PLUGIN_EVENT_MAILER_RECIPIENTDESC);
             $propbag->add('default', '');
             return true;