svn: /web/doc-editor/trunk/php/ File.php

yannick                                  Wed, 30 Dec 2009 01:04:39 +0000

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

Log:
Fix regex to parse diff receive from VCS

Changed paths:
    U   web/doc-editor/trunk/php/File.php

Modified: web/doc-editor/trunk/php/File.php
===================================================================
--- web/doc-editor/trunk/php/File.php	2009-12-30 00:45:32 UTC (rev 292784)
+++ web/doc-editor/trunk/php/File.php	2009-12-30 01:04:39 UTC (rev 292785)
@@ -308,9 +308,8 @@
             $this->name, $rev1, $rev2
         );
         $output = htmlentities(join("\n", $output));
-
         $match = array();
-        preg_match_all('/@@(.*?)@@(.[^@@]*)/s', $output, $match);
+        preg_match_all('/@@(.*?)@@(.*(?!@@).*)/s', $output, $match);

         $diff = array();
         for ($i = 0; $i < count($match[1]); $i++) {