Resolve some failed bookmark and tag tests

diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
index 55d6a0f6e862e4914a71c284f3b697dc34148db8..42aaa958df16f1b7d69c24a800ff732ab23d4a4a 100644 (file)
--- a/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@ -220,8 +220,8 @@ if ($currenttag!= '') {
        $size = count($rsschannels);
        for ($i = 0; $i < $size; $i++) {
                $brss =  '<a style="background:#FFFFFF" href="'. htmlspecialchars($rsschannels[$i][1]) . '"'
-            . ' title="' . htmlspecialchars($rsschannels[$i][0]) . '">'
-            . '<img src="' . ROOT . 'images/rss.gif" width="16" height="16" alt="' . htmlspecialchars($rsschannels[$i][0]) .'"/>'
+            . ' title="' . $rsschannels[$i][0] . '">'
+            . '<img src="' . ROOT . 'images/rss.gif" width="16" height="16" alt="' . $rsschannels[$i][0] .'"/>'
             . '</a>';
        }
 

diff --git a/tests/AllTests.php b/tests/AllTests.php
index 9e825e85e559712796f2f4d165195879a984edc2..92f8960d69b634f77d41c48c4345ec4d251319ab 100644 (file)
--- a/tests/AllTests.php
+++ b/tests/AllTests.php
@@ -46,6 +46,7 @@ class AllTests extends PHPUnit_Framework_TestSuite
         $suite->addTestFile($tdir . '/VoteTest.php');
         $suite->addTestFile($tdir . '/UserTest.php');
         $suite->addTestFile($tdir . '/Api/ExportCsvTest.php');
+        $suite->addTestFile($tdir . '/Api/OpenSearchTest.php');
         $suite->addTestFile($tdir . '/Api/PostsAddTest.php');
         $suite->addTestFile($tdir . '/Api/PostsDeleteTest.php');
         $suite->addTestFile($tdir . '/Api/PostsUpdateTest.php');
@@ -58,4 +59,4 @@ class AllTests extends PHPUnit_Framework_TestSuite
     {
     }
 }
-?>
\ No newline at end of file
+?>

diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php
index 02e2b38f2878324d120053a7a70d38fdf9c7f9ad..e6d053112d9293a3a80fc9c983e61f898bdb0e17 100644 (file)
--- a/tests/Api/PostsAddTest.php
+++ b/tests/Api/PostsAddTest.php
@@ -108,7 +108,7 @@ TXT;
 
         $this->assertEquals($bmUrl, $bm['bAddress']);
         $this->assertEquals($bmTitle, $bm['bTitle']);
-        $this->assertEquals($bmDescription, $bm['bDescription']);
+        $this->assertEquals($bmDescription, stripslashes($bm['bDescription']));
         $this->assertEquals($bmTags, $bm['tags']);
         $this->assertEquals(
             gmdate('Y-m-d H:i:s', strtotime($bmDatetime)),
@@ -170,7 +170,7 @@ TXT;
 
         $this->assertEquals($bmUrl, $bm['bAddress']);
         $this->assertEquals($bmTitle, $bm['bTitle']);
-        $this->assertEquals($bmDescription, $bm['bDescription']);
+        $this->assertEquals($bmDescription, stripslashes($bm['bDescription']));
         $this->assertEquals($bmTags, $bm['tags']);
         $this->assertEquals(
             gmdate('Y-m-d H:i:s', strtotime($bmDatetime)),

diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php
index 789540f85910b30252ee9ae6ce1040bc5fabcedf..66a6e1fc5de8268e57dc457e9181dcd83bc8f2d0 100644 (file)
--- a/tests/Bookmark2TagTest.php
+++ b/tests/Bookmark2TagTest.php
@@ -290,8 +290,8 @@ class Bookmark2TagTest extends TestBase
         $arTags = $this->b2ts->getPopularTags(null, 10, null, 1);
         $this->assertInternalType('array', $arTags);
         $this->assertEquals(3, count($arTags));
-        $this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags);
-        $this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags);
+        $this->assertContains(array('tag' => 'one', 'bCount' => '3'), $arTags);
+        $this->assertContains(array('tag' => 'two', 'bCount' => '2'), $arTags);
         $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags);
 
         $arTags = $this->b2ts->getPopularTags(null, 10, null, 2);
@@ -608,4 +608,4 @@ class Bookmark2TagTest extends TestBase
         $this->assertContains(array('tag' => 'usable', 'bCount' => '2'), $arTags);
     }
 }
-?>
\ No newline at end of file
+?>

diff --git a/www/index.php b/www/index.php
index 09779239bd4c04b899f76b66f2a2fa7ffc200416..931d64d45ac98814f10719a40e9aed2d668e6ca3 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -42,7 +42,7 @@ if (GET_ACTION == "logout") {
 // Header variables
 $tplVars['loadjs'] = true;
 $tplVars['rsschannels'] = array(
-array(sprintf(T_('%s: Recent bookmarks'), $sitename), createURL('rss').'?sort='.getSortOrder())
+array(sprintf(T_('%s: Recent bookmarks'), htmlspecialchars($sitename)), createURL('rss').'?sort='.getSortOrder())
 );
 
 if ($userservice->isLoggedOn()) {