From 01b91b22f3b990b788898ed3478d6b55aa3f85b3 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Sat, 21 Jan 2012 12:10:33 +0100
Subject: subtitle was escaped too often in
http://bm.bogo/bookmarks/userb/userb-tag
---
www/bookmarks.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www/bookmarks.php b/www/bookmarks.php
index 54daed2..fe12310 100644
--- a/www/bookmarks.php
+++ b/www/bookmarks.php
@@ -305,8 +305,8 @@ if ($templatename == 'editbookmark.tpl') {
$tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle;
$tplVars['subtitlehtml'] = T_('My Bookmarks') . $catTitleWithUrls;
} else {
- $tplVars['pagetitle'] = $user.': '.$cat;
- $tplVars['subtitle'] = $pagetitle;
+ $tplVars['pagetitle'] = $user.': '.$cat;
+ $tplVars['subtitlehtml'] = $user . $catTitleWithUrls;
}
}
--
cgit v1.2.3-54-g00ecf
From df00540d4c2d5c03352d1e79e526ccd6f7cbcd9f Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Sat, 21 Jan 2012 12:22:30 +0100
Subject: fix artviper title
---
data/templates/default/bottom.inc.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/templates/default/bottom.inc.php b/data/templates/default/bottom.inc.php
index 0c966a2..e48f593 100644
--- a/data/templates/default/bottom.inc.php
+++ b/data/templates/default/bottom.inc.php
@@ -9,7 +9,7 @@ echo " SemanticScu
if($GLOBALS['enableWebsiteThumbnails']) {
// Licence to the thumbnails provider (OBLIGATORY IF YOU USE ARTVIPER SERVICE)
- echo ' (Thumbnails by )';
+ echo ' (Thumbnails by webdesign)';
}
?>
--
cgit v1.2.3-54-g00ecf
From 814f99d4711816c346d2df3761c7c4d2f86cd775 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Sat, 21 Jan 2012 12:38:17 +0100
Subject: Fix bug #3111254: getIdFromUser() always returns an integer now (part
2)
---
doc/ChangeLog | 1 +
src/SemanticScuttle/Model/User.php | 2 +-
tests/UserTest.php | 16 ++++++++++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 6a08fea..a8c3e12 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -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/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);
+ }
+
/**
--
cgit v1.2.3-54-g00ecf
From 795de13414f5722c0ab3614eb7b1851c4c2df2c2 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Sat, 21 Jan 2012 13:02:42 +0100
Subject: prepare release of 0.98.4
---
build.xml | 47 ++++++++++++++++++++++++++++++++----
data/templates/default/about.tpl.php | 2 +-
doc/ChangeLog | 2 +-
doc/README.rst | 2 +-
4 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/build.xml b/build.xml
index e60e861..431fdbf 100644
--- a/build.xml
+++ b/build.xml
@@ -10,13 +10,27 @@
-
+
@@ -138,6 +152,29 @@ contained it - thus no 0.98.3 PEAR package.
type="pear-config" from="@data_dir@" to="data_dir"
/>
+
+- 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])
+
+
+
+
- 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']);
isAdmin()): ?>
-SemanticScuttle v0.98.3
+SemanticScuttle v0.98.4
diff --git a/doc/ChangeLog b/doc/ChangeLog
index a8c3e12..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
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.
--
cgit v1.2.3-54-g00ecf