Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 26 Nov 2014 09:22:56 +0000 (09:22 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 26 Nov 2014 09:22:56 +0000 (09:22 +0000)
lib/classes/update/checker.php
mod/forum/classes/message/inbound/reply_handler.php

index 3ec3f98..d9f207c 100644 (file)
@@ -635,7 +635,7 @@ class checker {
         global $CFG;
 
         if (empty($changes)) {
-            return;
+            return array();
         }
 
         $notifications = array();
index 90a8045..86d91d5 100644 (file)
@@ -147,7 +147,7 @@ class reply_handler extends \core\message\inbound\handler {
             $newsubject = $post->subject;
             if (!strpos($restring, $post->subject)) {
                 // The previous post did not contain a re string, add it.
-                $newsubject = $restring . ' ' . $subject;
+                $newsubject = $restring . ' ' . $newsubject;
             }
             mtrace("--> Note: Post subject matched original post subject. Optimising from {$subject} to {$newsubject}");
             $subject = $newsubject;