From 34600fe502c625217776c909903035d9ab937dea Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Wed, 17 Aug 2011 18:20:52 +0200
Subject: Fix bug: URLs were escaped too often in bookmark list
---
doc/ChangeLog | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'doc/ChangeLog')
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 942c65c..1c5f36f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,11 @@ ChangeLog for SemantiScuttle
.. contents::
+0.98.4 - 2011-XX-XX
+-------------------
+- Fix bug: URLs were escaped too often in bookmark list
+
+
0.98.3 - 2011-08-09
-------------------
- Fix bug #3388456: Missing scripts/fix-unfiled-tags.php
--
cgit v1.2.3-54-g00ecf
From 000daf70ca8e3301b88be310949d4cd6cbadce4e Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Wed, 17 Aug 2011 18:24:26 +0200
Subject: Fix bug: Subtitle was not escaped
---
data/templates/default/top.inc.php | 2 +-
doc/ChangeLog | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'doc/ChangeLog')
diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php
index 17ec982..f2adba4 100644
--- a/data/templates/default/top.inc.php
+++ b/data/templates/default/top.inc.php
@@ -49,7 +49,7 @@ if(!isset($_GET['popup'])) {
'. $subtitle ."\n";
+ echo '
'. htmlspecialchars($subtitle) ."
\n";
}
if(DEBUG_MODE) {
echo ''. T_('Admins, your installation is in "Debug Mode" ($debugMode = true). To go in "Normal Mode" and hide debugging messages, change $debugMode to false into config.php.') ."
\n";
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1c5f36f..05a6405 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle
0.98.4 - 2011-XX-XX
-------------------
- Fix bug: URLs were escaped too often in bookmark list
+- Fix bug: Subtitle was not escaped
0.98.3 - 2011-08-09
--
cgit v1.2.3-54-g00ecf
From adf2655b2342e91c952c71364f91f6cb2e2d4016 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Fri, 19 Aug 2011 19:01:19 +0200
Subject: Fix bug #3393951: Logo images missing on bookmark page
---
data/templates/default/bookmarks.tpl.php | 4 ++--
doc/ChangeLog | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
(limited to 'doc/ChangeLog')
diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php
index 70fe788..2a3d169 100644
--- a/data/templates/default/bookmarks.tpl.php
+++ b/data/templates/default/bookmarks.tpl.php
@@ -39,9 +39,9 @@ include('search.menu.php');
isAdmin($userid) && $pageName != PAGE_WATCHLIST) : ?>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 05a6405..0d3563c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -7,6 +7,7 @@ ChangeLog for SemantiScuttle
-------------------
- Fix bug: URLs were escaped too often in bookmark list
- Fix bug: Subtitle was not escaped
+- Fix bug #3393951: Logo images missing on bookmark page
0.98.3 - 2011-08-09
--
cgit v1.2.3-54-g00ecf
From 5d929ec8e0b9bbee267c2eaa1837ce1910d08420 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Fri, 19 Aug 2011 19:16:45 +0200
Subject: Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions
---
doc/ChangeLog | 1 +
www/tag2tagadd.php | 2 +-
www/tag2tagdelete.php | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
(limited to 'doc/ChangeLog')
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0d3563c..7e3a064 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -8,6 +8,7 @@ ChangeLog for SemantiScuttle
- Fix bug: URLs were escaped too often in bookmark list
- Fix bug: Subtitle was not escaped
- Fix bug #3393951: Logo images missing on bookmark page
+- Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions
0.98.3 - 2011-08-09
diff --git a/www/tag2tagadd.php b/www/tag2tagadd.php
index d660451..3f4af8c 100644
--- a/www/tag2tagadd.php
+++ b/www/tag2tagadd.php
@@ -59,7 +59,7 @@ if (POST_CONFIRM != '') {
exit();
}
} elseif (POST_CANCEL) {
- header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
+ header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag1));
}
$tplVars['links'] = $tag2tagservice->getLinks($currentUser->getId());
diff --git a/www/tag2tagdelete.php b/www/tag2tagdelete.php
index c1e52cd..06fea98 100644
--- a/www/tag2tagdelete.php
+++ b/www/tag2tagdelete.php
@@ -71,7 +71,7 @@ if (POST_CONFIRM) {
exit();
}
} elseif (POST_CANCEL) {
- header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
+ header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag1));
}
$tplVars['links'] = $tag2tagservice->getLinks($currentUser->getId());
--
cgit v1.2.3-54-g00ecf
From e81599e4375b4ae12ff7fe65e0810479ad719b4a Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Tue, 1 Nov 2011 06:41:25 +0100
Subject: Fix bug #3399815: PHP error in opensearch API in 0.98.3
---
doc/ChangeLog | 1 +
www/api/opensearch.php | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'doc/ChangeLog')
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7e3a064..50015c8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -9,6 +9,7 @@ ChangeLog for SemantiScuttle
- Fix bug: Subtitle was not escaped
- Fix bug #3393951: Logo images missing on bookmark page
- Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions
+- Fix bug #3399815: PHP error in opensearch API in 0.98.3
0.98.3 - 2011-08-09
diff --git a/www/api/opensearch.php b/www/api/opensearch.php
index db95639..3e7dbf7 100644
--- a/www/api/opensearch.php
+++ b/www/api/opensearch.php
@@ -1,8 +1,8 @@
\n";
?>
-
--
cgit v1.2.3-54-g00ecf