summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/SemanticScuttle/Service/Bookmark2Tag.php3
-rw-r--r--tests/Bookmark2TagTest.php15
2 files changed, 14 insertions, 4 deletions
diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php
index 49517b0..a01b5d7 100644
--- a/src/SemanticScuttle/Service/Bookmark2Tag.php
+++ b/src/SemanticScuttle/Service/Bookmark2Tag.php
@@ -626,12 +626,13 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
return false;
}
+ $output = false;
if ($row = $this->db->sql_fetchrow($dbresult)) {
if ($row['tCount'] > 0) {
$output = true;
}
}
- $output = false;
+
$this->db->sql_freeresult($dbresult);
return $output;
}
diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php
index fdfc42e..76390d9 100644
--- a/tests/Bookmark2TagTest.php
+++ b/tests/Bookmark2TagTest.php
@@ -88,7 +88,7 @@ class Bookmark2TagTest extends TestBase
$this->b2ts->getTagsForBookmark($bid, true)
);
}
-
+
public function testAttachTagsWithEmptyStringAddsSystemUnfiled()
{
$originalDisplayErros = ini_get('display_errors');
@@ -582,7 +582,7 @@ class Bookmark2TagTest extends TestBase
$this->addBookmark($user1, null, 0, array('usertag'));
$GLOBALS['admin_users'] = array('admin1', 'admin2');
-
+
$arTags = $this->b2ts->getAdminTags(4);
$this->assertEquals(3, count($arTags));
$this->assertContains(array('tag' => 'admintag', 'bCount' => '2'), $arTags);
@@ -600,7 +600,7 @@ class Bookmark2TagTest extends TestBase
$this->addBookmark($admin1, null, 0, array('tester', 'testos'));
$GLOBALS['admin_users'] = array('admin1');
-
+
$arTags = $this->b2ts->getAdminTags(4, null, null, 'test');
$this->assertEquals(2, count($arTags));
$this->assertContains(array('tag' => 'tester', 'bCount' => '1'), $arTags);
@@ -675,5 +675,14 @@ class Bookmark2TagTest extends TestBase
$this->assertContains(array('tag' => 'usertag1', 'bCount' => '1'), $arTags);
$this->assertContains(array('tag' => 'usable', 'bCount' => '2'), $arTags);
}
+
+ public function testHasTag()
+ {
+ $bid = $this->addBookmark(null, null, 0, array('foo'));
+
+ $this->assertTrue($this->b2ts->hasTag($bid, 'foo'));
+ $this->assertFalse($this->b2ts->hasTag($bid, 'bar'));
+
+ }
}
?>