stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-04 02:39:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

#2031 - Add class_exists() before method_exists() if class existence is unknown.

Browse Source 
- fixed all instances of this in core code
- deleted previous Zend Guard Loader workaround in MY_Kohana.php
- updated Bootstrap.php to reflect deleted MY_Kohana.php
This commit is contained in:
shadlaws
2013-03-02 13:25:10 +01:00
parent 0d05e91cd3
commit 9b9f1a7b07
16 changed files with 32 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gallery/tests/SafeString_Test.php
View File

@@ -91,7 +91,7 @@ class SafeString_Test extends Gallery_Unit_Test_Case {
public function purify_test() {
$safe_string = SafeString::purify("hello <p >world</p>");
$expected = method_exists("purifier", "purify")
$expected = (class_exists("purifier") && method_exists("purifier", "purify"))
? "hello <p>world</p>"
: "hello &lt;p &gt;world&lt;/p&gt;";
$this->assert_equal($expected, $safe_string);
@@ -100,7 +100,7 @@ class SafeString_Test extends Gallery_Unit_Test_Case {
public function purify_twice_test() {
$safe_string = SafeString::purify("hello <p >world</p>");
$safe_string_2 = SafeString::purify($safe_string);
$expected = method_exists("purifier", "purify")
$expected = (class_exists("purifier") && method_exists("purifier", "purify"))
? "hello <p>world</p>"
: "hello &lt;p &gt;world&lt;/p&gt;";
$this->assert_equal($expected, $safe_string_2);