diff options
| -rw-r--r-- | build.xml | 47 | ||||
| -rw-r--r-- | data/templates/default/about.tpl.php | 2 | ||||
| -rw-r--r-- | doc/ChangeLog | 3 | ||||
| -rw-r--r-- | doc/README.rst | 2 | ||||
| -rw-r--r-- | src/SemanticScuttle/Model/User.php | 2 | ||||
| -rw-r--r-- | tests/UserTest.php | 16 |
6 files changed, 63 insertions, 9 deletions
@@ -10,13 +10,27 @@ <property file="html.properties" /> <property name="version-m" value="0.98" /> - <property name="version" value="0.98.3" /> + <property name="version" value="0.98.4" /> <property name="stability" value="beta" /> <property name="releasenotes" value=" -- Fix bug #3388456: Missing scripts/fix-unfiled-tags.php - -The script was only missing in the .zip file; the PEAR package -contained it - thus no 0.98.3 PEAR package. +- Fix bug #3439729: URLs were escaped too often in bookmark list +- Fix bug: Subtitle was not escaped +- Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions +- Fix bug #3393951: Logo images missing on bookmark page +- Fix bug #3399815: PHP error in opensearch API in 0.98.3 +- Fix bug #3407728: Can't delete users from admin page +- Fix bug #3431742: open_basedir problems with /etc/ config files +- Fix bug #3436624: Wrong URL for Delicious API when importing +- Fix bug #3463481: RSS feed show warnings in feedvalidator.org +- Fix bug #3384416: Use URL with protocol in bookmarklet +- Fix bug: Invalid HTML when website thumbnails are activated +- Fix bug #3413459: Thumbnails not in one line +- Fix bug #3468293: Delicious import does not preserve private links +- Fix bug #3396727: Title of http://lesscss.org/ not loaded +- Fix bug #3111254: getIdFromUser() always returns an integer now (part 2) +- Implement request #3403609: fr_CA translation update +- Implement patch #3476011: PostgreSQL tables can not be initialized + (Frédéric Fauberteau [triaxx]) " /> <property name="zipfile" value="${phing.project.name}-${version}.zip" /> <property name="pkgfile" value="${phing.project.name}-${version}.tgz" /> @@ -150,6 +164,29 @@ contained it - thus no 0.98.3 PEAR package. type="pear-config" from="@data_dir@" to="data_dir" /> + <changelog version="0.98.4" date="2012-01-21" license="GPL"> +- Fix bug #3439729: URLs were escaped too often in bookmark list +- Fix bug: Subtitle was not escaped +- Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions +- Fix bug #3393951: Logo images missing on bookmark page +- Fix bug #3399815: PHP error in opensearch API in 0.98.3 +- Fix bug #3407728: Can't delete users from admin page +- Fix bug #3431742: open_basedir problems with /etc/ config files +- Fix bug #3436624: Wrong URL for Delicious API when importing +- Fix bug #3463481: RSS feed show warnings in feedvalidator.org +- Fix bug #3384416: Use URL with protocol in bookmarklet +- Fix bug: Invalid HTML when website thumbnails are activated +- Fix bug #3413459: Thumbnails not in one line +- Fix bug #3468293: Delicious import does not preserve private links +- Fix bug #3396727: Title of http://lesscss.org/ not loaded +- Fix bug #3111254: getIdFromUser() always returns an integer now (part 2) +- Implement request #3403609: fr_CA translation update +- Implement patch #3476011: PostgreSQL tables can not be initialized + (Frédéric Fauberteau [triaxx]) + </changelog> + + <!-- 0.98.3 was not needed --> + <changelog version="0.98.2" date="2011-08-08" license="GPL"> - Fix bug #3385724: Rename tag ends with XML Parsing Error - Fix bug #3386178: "system:unfiled" secret tag does not work diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php index bd9348c..d850783 100644 --- a/data/templates/default/about.tpl.php +++ b/data/templates/default/about.tpl.php @@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']); <?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?> -<li>SemanticScuttle v0.98.3</li> +<li>SemanticScuttle v0.98.4</li> <?php endif ?> </ul> diff --git a/doc/ChangeLog b/doc/ChangeLog index 6a08fea..1711127 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -3,7 +3,7 @@ ChangeLog for SemantiScuttle .. contents:: -0.98.4 - 2011-XX-XX +0.98.4 - 2012-01-21 ------------------- - Fix bug #3439729: URLs were escaped too often in bookmark list - Fix bug: Subtitle was not escaped @@ -19,6 +19,7 @@ ChangeLog for SemantiScuttle - Fix bug #3413459: Thumbnails not in one line - Fix bug #3468293: Delicious import does not preserve private links - Fix bug #3396727: Title of http://lesscss.org/ not loaded +- Fix bug #3111254: getIdFromUser() always returns an integer now (part 2) - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) diff --git a/doc/README.rst b/doc/README.rst index a8ef83e..caf6b75 100644 --- a/doc/README.rst +++ b/doc/README.rst @@ -1,5 +1,5 @@ ====================== -SemanticScuttle 0.98.3 +SemanticScuttle 0.98.4 ====================== A social bookmarking tool experimenting with new features like structured tags or collaborative descriptions of tags. diff --git a/src/SemanticScuttle/Model/User.php b/src/SemanticScuttle/Model/User.php index 3aa617b..e5d29af 100644 --- a/src/SemanticScuttle/Model/User.php +++ b/src/SemanticScuttle/Model/User.php @@ -56,7 +56,7 @@ class SemanticScuttle_Model_User */ public function getId() { - return $this->id; + return (int)$this->id; } /** diff --git a/tests/UserTest.php b/tests/UserTest.php index 6cd6786..85d2204 100644 --- a/tests/UserTest.php +++ b/tests/UserTest.php @@ -246,6 +246,22 @@ class UserTest extends TestBase ); } + public function testGetIdFromUserParamId() + { + $uid = $this->addUser(); + $newId = $this->us->getIdFromUser($uid); + $this->assertInternalType('integer', $newId); + $this->assertEquals($uid, $newId); + } + + public function testGetIdFromUserParamUsername() + { + $uid = $this->addUser('someusername'); + $newId = $this->us->getIdFromUser('someusername'); + $this->assertInternalType('integer', $newId); + $this->assertEquals($uid, $newId); + } + /** |