55 * PHP version 5
66 *
77 * Copyright (c) 2009 Chris Boulton <[email protected] > 8- *
8+ *
99 * All rights reserved.
10- *
11- * Redistribution and use in source and binary forms, with or without
10+ *
11+ * Redistribution and use in source and binary forms, with or without
1212 * modification, are permitted provided that the following conditions are met:
1313 *
1414 * - Redistributions of source code must retain the above copyright notice,
1515 * this list of conditions and the following disclaimer.
1616 * - Redistributions in binary form must reproduce the above copyright notice,
1717 * this list of conditions and the following disclaimer in the documentation
1818 * and/or other materials provided with the distribution.
19- * - Neither the name of the Chris Boulton nor the names of its contributors
20- * may be used to endorse or promote products derived from this software
19+ * - Neither the name of the Chris Boulton nor the names of its contributors
20+ * may be used to endorse or promote products derived from this software
2121 * without specific prior written permission.
2222 *
23- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
27- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
31- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
23+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
27+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
31+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3333 * POSSIBILITY OF SUCH DAMAGE.
3434 *
3535 * @package DiffLib
@@ -177,7 +177,9 @@ private function formatLines($lines)
177177 $ lines = array_map (array ($ this , 'ExpandTabs ' ), $ lines );
178178 //$lines = array_map(array($this, 'HtmlSafe'), $lines);
179179 foreach ($ lines as &$ line ) {
180- $ line = preg_replace ('# ( +)|^ #e ' , "\$this->fixSpaces(' \\1') " , $ line );
180+ $ line = preg_replace_callback ('# ( +)|^ # ' , function ($ matches ) {
181+ return $ this ->fixSpaces ($ matches [1 ]);
182+ }, $ line );
181183 }
182184 return $ lines ;
183185 }
@@ -221,4 +223,4 @@ private function htmlSafe($string)
221223 {
222224 return htmlspecialchars ($ string , ENT_NOQUOTES , 'UTF-8 ' );
223225 }
224- }
226+ }
0 commit comments