Skip to content

Commit 0ef9663

Browse files
committed
some fixing
1 parent a9b8ef7 commit 0ef9663

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

lib/Diff.php

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@
88
* PHP version 5
99
*
1010
* Copyright (c) 2009 Chris Boulton <chris.boulton@interspire.com>
11-
*
11+
*
1212
* 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
1515
* modification, are permitted provided that the following conditions are met:
1616
*
1717
* - Redistributions of source code must retain the above copyright notice,
1818
* this list of conditions and the following disclaimer.
1919
* - Redistributions in binary form must reproduce the above copyright notice,
2020
* this list of conditions and the following disclaimer in the documentation
2121
* 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
2424
* without specific prior written permission.
2525
*
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
3636
* POSSIBILITY OF SUCH DAMAGE.
3737
*
3838
* @package Diff
@@ -67,13 +67,16 @@ class Diff
6767
'context' => 3,
6868
'ignoreNewLines' => false,
6969
'ignoreWhitespace' => false,
70-
'ignoreCase' => false
70+
'ignoreCase' => false,
71+
'title_a'=>'Old Version',
72+
'title_b'=>'New Version',
73+
'labelDifferences'=>'Differences'
7174
);
7275

7376
/**
7477
* @var array Array of the options that have been applied for generating the diff.
7578
*/
76-
private $options = array();
79+
public $options = array();
7780

7881
/**
7982
* The constructor.

0 commit comments

Comments
 (0)