|
8 | 8 | * PHP version 5
|
9 | 9 | *
|
10 | 10 | * Copyright (c) 2009 Chris Boulton <chris.boulton@interspire.com>
|
11 |
| - * |
| 11 | + * |
12 | 12 | * All rights reserved.
|
13 |
| - * |
14 |
| - * Redistribution and use in source and binary forms, with or without |
| 13 | + * |
| 14 | + * Redistribution and use in source and binary forms, with or without |
15 | 15 | * modification, are permitted provided that the following conditions are met:
|
16 | 16 | *
|
17 | 17 | * - Redistributions of source code must retain the above copyright notice,
|
18 | 18 | * this list of conditions and the following disclaimer.
|
19 | 19 | * - Redistributions in binary form must reproduce the above copyright notice,
|
20 | 20 | * this list of conditions and the following disclaimer in the documentation
|
21 | 21 | * and/or other materials provided with the distribution.
|
22 |
| - * - Neither the name of the Chris Boulton nor the names of its contributors |
23 |
| - * may be used to endorse or promote products derived from this software |
| 22 | + * - Neither the name of the Chris Boulton nor the names of its contributors |
| 23 | + * may be used to endorse or promote products derived from this software |
24 | 24 | * without specific prior written permission.
|
25 | 25 | *
|
26 |
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
27 |
| - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
28 |
| - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
29 |
| - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
30 |
| - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
31 |
| - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
32 |
| - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
33 |
| - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
34 |
| - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
35 |
| - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| 26 | + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
| 27 | + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 28 | + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| 29 | + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
| 30 | + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 31 | + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 32 | + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| 33 | + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
| 34 | + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 35 | + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
36 | 36 | * POSSIBILITY OF SUCH DAMAGE.
|
37 | 37 | *
|
38 | 38 | * @package Diff
|
@@ -67,13 +67,16 @@ class Diff
|
67 | 67 | 'context' => 3,
|
68 | 68 | 'ignoreNewLines' => false,
|
69 | 69 | 'ignoreWhitespace' => false,
|
70 |
| - 'ignoreCase' => false |
| 70 | + 'ignoreCase' => false, |
| 71 | + 'title_a'=>'Old Version', |
| 72 | + 'title_b'=>'New Version', |
| 73 | + 'labelDifferences'=>'Differences' |
71 | 74 | );
|
72 | 75 |
|
73 | 76 | /**
|
74 | 77 | * @var array Array of the options that have been applied for generating the diff.
|
75 | 78 | */
|
76 |
| - private $options = array(); |
| 79 | + public $options = array(); |
77 | 80 |
|
78 | 81 | /**
|
79 | 82 | * The constructor.
|
|
0 commit comments