Fixes #4131 elgg_delete_metastring_based_object_by_id() should return a bool

diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php
index 9dccec700e9f15e68d10b9de9d544ba9b82bc1fc..9fe9b4bff507c716e6c41578a16d5c80e4be9df3 100644 (file)
--- a/engine/lib/metastrings.php
+++ b/engine/lib/metastrings.php
@@ -810,7 +810,7 @@ function elgg_delete_metastring_based_object_by_id($id, $type) {
                }
 
                if (($obj->canEdit()) && (elgg_trigger_event('delete', $type, $obj))) {
-                       return delete_data("DELETE from $table where id=$id");
+                       return (bool)delete_data("DELETE from $table where id=$id");
                }
        }
 

diff --git a/engine/tests/api/metastrings.php b/engine/tests/api/metastrings.php
index 0a008c6ceac4e3e1fe3bd4d3aa9f9154f2030350..f6870d34beed59f731e4e47a1670e0b97ea07c2a 100644 (file)
--- a/engine/tests/api/metastrings.php
+++ b/engine/tests/api/metastrings.php
@@ -80,7 +80,7 @@ class ElggCoreMetastringsTest extends ElggCoreUnitTest {
                        $test = get_data($q);
 
                        $this->assertEqual($test[0]->id, $id);
-                       $this->assertTrue(elgg_delete_metastring_based_object_by_id($id, $type));
+                       $this->assertIdentical(true, elgg_delete_metastring_based_object_by_id($id, $type));
                        $this->assertFalse(get_data($q));
                }
        }