svn: / SVNROOT/commit-email.php web/php-bugs/trunk/rpc.php

--cf47a000cd1400080473e99b13eac68d5339a3ed
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

rasmus		Sun, 19 Jul 2009 22:16:35 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=284389

Changed paths:
	U   SVNROOT/commit-email.php
	U   web/php-bugs/trunk/rpc.php

Log:
Tweaks


Modified: SVNROOT/commit-email.php
===================================================================
--- SVNROOT/commit-email.php	2009-07-19 22:14:12 UTC (rev 284388)
+++ SVNROOT/commit-email.php	2009-07-19 22:16:35 UTC (rev 284389)
@@ -123,7 +123,6 @@
 $commit_date = strtotime(substr($commit_info[1], 0, strlen("0000-00-00 00:00:00 +0000")));
 $commit_log = implode("\n", array_slice($commit_info, 3));
 // Support bug#1234 bug url extraction
-$bugs = preg_match_all("/(?:bug|#)[\\s#:]*([0-9]+)/i", $commit_log, $bugs_array);
 $bugs = preg_match_all("/(?:pecl|pear|)\\s*(?:bug|#)[\\s#:]*([0-9]+)/i", $commit_log, $bugs_array);

 // -----------------------------------------------------------------------------------------------------------------------------
@@ -220,7 +219,7 @@
 $bugs_body = '';
 if ($bugs) {
     include '/home/svn/SVNROOT/secret.inc';
-    $bugs_body = (count($bugs_array[1])>1) ? "Bug: " : "Bugs: ";
+    $bugs_body = (count($bugs_array[1])>1) ? "Bugs: " : "Bug: ";
     foreach ($bugs_array[1] as $k=>$bug_id) {
         $bug_sdesc = '';
         $bug_status = '';
@@ -257,7 +256,7 @@
             "{$commit_user}\t\t" . date(DATE_RFC2822, $commit_date) . "\r\n" .
             "\r\n" .
             "Revision: http://svn.php.net/viewvc?view=revision&revision={$REV}\r\n" .
-            $bugs_body .
+            "\r\n". $bugs_body .
             "\r\n" .
             "Changed paths:\r\n" .
             "\t" . implode("\r\n\t", $changed_paths) . "\r\n" .

Modified: web/php-bugs/trunk/rpc.php
===================================================================
--- web/php-bugs/trunk/rpc.php	2009-07-19 22:14:12 UTC (rev 284388)
+++ web/php-bugs/trunk/rpc.php	2009-07-19 22:16:35 UTC (rev 284389)
@@ -50,6 +50,7 @@
     $success = @mysql_query($query);
     if($success) {
         echo json_encode(array('result'=>array('status'=>$bug)));
+        exit;
     } else {
         echo json_encode(array('result'=>array('error'=>mysql_error())));
         exit;

--cf47a000cd1400080473e99b13eac68d5339a3ed--