Skip to content

Commit 87ab1f6

Browse files
committed
showall default option was added to wrong base class. Added to renderer instead
1 parent 342f158 commit 87ab1f6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/Diff.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ class Diff
7272
'context' => 3, //???
7373
'ignoreNewLines' => false, //ignore new lines in comparison
7474
'ignoreWhitespace' => false, //ignore whitespace in comparision
75-
'ignoreCase' => false, //ignore case in comparisons
76-
'showall'=>false //do not fold identical lines into elipses
75+
'ignoreCase' => false //ignore case in comparisons
7776
);
7877

7978
/**

lib/Diff/Renderer/Abstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,6 @@ public function setOptions(array $options)
8888
*/
8989
public function getOption($name)
9090
{
91-
return isset($this->options[$name]) ? $this->options[$name] : null;
91+
return (isset($this->options[$name]) ? $this->options[$name] : null);
9292
}
9393
}

lib/Diff/Renderer/Html/Array.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ class Diff_Renderer_Html_Array extends Diff_Renderer_Abstract
4848
* @var array Array of the default options that apply to this renderer.
4949
*/
5050
protected $defaultOptions = array(
51-
'tabSize' => 4
51+
'tabSize' => 4,
52+
'showall'=>false //do not fold identical lines into elipses
5253
);
5354

5455
/**

0 commit comments

Comments
 (0)