diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-10 08:07:20 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-10 08:07:20 -0800 |
| commit | b42c736607591f8e2bed4aea474ad622b3f7445a (patch) | |
| tree | 83be1069a48cf604a0f73c5d895248c724024fc7 /modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php | |
| parent | 5e703186fbf0c0cb689fc737de7c074249361ef9 (diff) | |
| parent | 8763e475adc7bb26ed9705c9d61a1db2b20e60c4 (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/organize/js/organize.js
Diffstat (limited to 'modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php')
| -rw-r--r-- | modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php b/modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php index 509b4125..545af0fe 100644 --- a/modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php +++ b/modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php @@ -24,7 +24,7 @@ class Gallery_Unit_Test_Case extends Unit_Test_Case { sprintf("Expected (%s) %s but received (%s) %s\n Diff: %s", gettype($expected), var_export($expected, true), gettype($actual), var_export($actual, true), - diff::compare(var_export($expected, true), var_export($actual, true))), + test::diff(var_export($expected, true), var_export($actual, true))), $debug); } return $this; |