5
5
* PHP version 5
6
6
*
7
7
* Copyright (c) 2009 Chris Boulton <chris.boulton@interspire.com>
8
- *
8
+ *
9
9
* 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
12
12
* modification, are permitted provided that the following conditions are met:
13
13
*
14
14
* - Redistributions of source code must retain the above copyright notice,
15
15
* this list of conditions and the following disclaimer.
16
16
* - Redistributions in binary form must reproduce the above copyright notice,
17
17
* this list of conditions and the following disclaimer in the documentation
18
18
* 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
21
21
* without specific prior written permission.
22
22
*
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
33
33
* POSSIBILITY OF SUCH DAMAGE.
34
34
*
35
35
* @package DiffLib
@@ -177,7 +177,9 @@ private function formatLines($lines)
177
177
$ lines = array_map (array ($ this , 'ExpandTabs ' ), $ lines );
178
178
//$lines = array_map(array($this, 'HtmlSafe'), $lines);
179
179
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 );
181
183
}
182
184
return $ lines ;
183
185
}
@@ -221,4 +223,4 @@ private function htmlSafe($string)
221
223
{
222
224
return htmlspecialchars ($ string , ENT_NOQUOTES , 'UTF-8 ' );
223
225
}
224
- }
226
+ }
0 commit comments