+ * @license GPL http://www.gnu.org/licenses/gpl.html
+ * @link http://sourceforge.net/projects/semanticscuttle
+ */
+class UserArrayTest extends PHPUnit_Framework_TestCase
+{
+
+ public function testGetNameLongName()
+ {
+ $this->assertEquals(
+ 'John Doe',
+ SemanticScuttle_Model_UserArray::getName(
+ array(
+ 'name' => 'John Doe',
+ 'username' => 'jdoe'
+ )
+ )
+ );
+ }
+
+ public function testGetNameUsernameIfNameIsEmpty()
+ {
+ $this->assertEquals(
+ 'jdoe',
+ SemanticScuttle_Model_UserArray::getName(
+ array(
+ 'name' => '',
+ 'username' => 'jdoe'
+ )
+ )
+ );
+ }
+
+ public function testGetNameUsernameIfNameIsNotSet()
+ {
+ $this->assertEquals(
+ 'jdoe',
+ SemanticScuttle_Model_UserArray::getName(
+ array(
+ 'username' => 'jdoe'
+ )
+ )
+ );
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/UserTest.php b/tests/UserTest.php
index 6da7776..49f3730 100644
--- a/tests/UserTest.php
+++ b/tests/UserTest.php
@@ -143,7 +143,7 @@ class UserTest extends TestBase
$uid = $this->addUser();
$users = $this->us->getObjectUsers();
$this->assertEquals(1, count($users));
- $this->assertType('SemanticScuttle_Model_User', reset($users));
+ $this->assertInstanceOf('SemanticScuttle_Model_User', reset($users));
}
@@ -160,7 +160,7 @@ class UserTest extends TestBase
$uid3 = $this->addUser();
$users = $this->us->getObjectUsers();
$this->assertEquals(3, count($users));
- $this->assertType('SemanticScuttle_Model_User', reset($users));
+ $this->assertInstanceOf('SemanticScuttle_Model_User', reset($users));
}
diff --git a/www/gsearch/index.php b/www/gsearch/index.php
index 585536a..70be05e 100644
--- a/www/gsearch/index.php
+++ b/www/gsearch/index.php
@@ -31,7 +31,9 @@ if($GLOBALS['enableGoogleCustomSearch']==false) {
echo '';
echo T_('Admin tips: ');
echo T_('To refresh manually Google Custom Search Engine, goes to: ');
- echo 'http://www.google.com/coop/cse/cref
';
+ echo 'http://www.google.com/coop/cse/cref'
+ . '
';
echo T_('If no result appears, check that all the urls are valid in the admin section.');
echo '
';
diff --git a/www/jsScuttle.php b/www/jsScuttle.php
index f37da78..c166755 100644
--- a/www/jsScuttle.php
+++ b/www/jsScuttle.php
@@ -155,7 +155,10 @@ function processVotingResult() {
var bmnode = document.getElementById('bmv-'+bookmark);
bmnode.parentNode.replaceChild(
- response.getElementsByTagName('html')[0].firstChild,
+ xmlhttp.responseXML.importNode(
+ response.getElementsByTagName('html')[0].firstChild,
+ true
+ ),
bmnode
);
}
diff --git a/www/rss.php b/www/rss.php
index 6dcfb4c..298d9ba 100644
--- a/www/rss.php
+++ b/www/rss.php
@@ -116,7 +116,7 @@ foreach ($bookmarks_tmp as $key => $row) {
'title' => $row['bTitle'],
'link' => $_link,
'description' => $row['bDescription'],
- 'creator' => $row['username'],
+ 'creator' => SemanticScuttle_Model_UserArray::getName($row),
'pubdate' => $_pubdate,
'tags' => $row['tags']
);