From cf4036104b5fffd63473dfa53f44fd15ef4d1727 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 16 Aug 2011 20:09:41 +0200 Subject: fix sioc export --- www/api/export_sioc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www') diff --git a/www/api/export_sioc.php b/www/api/export_sioc.php index 8bdfd70..47ffc96 100644 --- a/www/api/export_sioc.php +++ b/www/api/export_sioc.php @@ -67,9 +67,9 @@ $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, NULL); - + - + -- cgit v1.2.3-54-g00ecf From 7a82f3ef2da0da3d49ae5d013734c29fdcdfe728 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 18 Aug 2011 16:18:28 +0200 Subject: revise bugfix of unescaped subtitle --- data/templates/default/top.inc.php | 6 ++++-- www/bookmarks.php | 2 +- www/tags.php | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'www') diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php index f2adba4..240e5b2 100644 --- a/data/templates/default/top.inc.php +++ b/data/templates/default/top.inc.php @@ -48,8 +48,10 @@ if(!isset($_GET['popup'])) { ?> '. htmlspecialchars($subtitle) ."\n"; +if (isset($subtitlehtml)) { + echo '

' . $subtitlehtml . "

\n"; +} else if (isset($subtitle)) { + 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/www/bookmarks.php b/www/bookmarks.php index 72c063e..54daed2 100644 --- a/www/bookmarks.php +++ b/www/bookmarks.php @@ -303,7 +303,7 @@ if ($templatename == 'editbookmark.tpl') { $tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s'); if ($userservice->isLoggedOn() && $user == $currentUsername) { $tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle; - $tplVars['subtitle'] = T_('My Bookmarks') . $catTitleWithUrls; + $tplVars['subtitlehtml'] = T_('My Bookmarks') . $catTitleWithUrls; } else { $tplVars['pagetitle'] = $user.': '.$cat; $tplVars['subtitle'] = $pagetitle; diff --git a/www/tags.php b/www/tags.php index 127f6c5..c56b97f 100644 --- a/www/tags.php +++ b/www/tags.php @@ -107,7 +107,7 @@ $tplVars['start'] = $start; $tplVars['popCount'] = 25; $tplVars['currenttag'] = $cat; $tplVars['sidebar_blocks'] = array('linked', 'related', 'menu2');//array('linked', 'related', 'popular'); -$tplVars['subtitle'] = $pagetitle; +$tplVars['subtitlehtml'] = $pagetitle; $tplVars['bookmarkCount'] = $start + 1; $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder()); $tplVars['total'] = $bookmarks['total']; -- 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 'www') 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 'www') 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