diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/ajax/getlinkedtags.php | 7 | ||||
| -rw-r--r-- | www/api/export_sioc.php | 4 | ||||
| -rw-r--r-- | www/bookmarks.php | 2 | ||||
| -rw-r--r-- | www/tag2tagadd.php | 2 | ||||
| -rw-r--r-- | www/tag2tagdelete.php | 2 | ||||
| -rw-r--r-- | www/tagrename.php | 2 | ||||
| -rw-r--r-- | www/tags.php | 2 |
7 files changed, 10 insertions, 11 deletions
diff --git a/www/ajax/getlinkedtags.php b/www/ajax/getlinkedtags.php index d8ddb5b..9bb3b1f 100644 --- a/www/ajax/getlinkedtags.php +++ b/www/ajax/getlinkedtags.php @@ -1,13 +1,12 @@ <?php /** - * Returns a list of tags linked to the given one, + * Returns a list of tags linked to the given one(s), * suitable for jsTree consumption. * * Accepted GET parameters: * * @param string $tag Tag for which the children tags shall be returned - * Multiple tags (separated with space or "+") are - * supported. + * Multiple tags (separated with comma) are supported. * If no tag is given, all top-level tags are loaded. * @param integer $uId User ID to fetch the tags for * @param boolean $parent Load parent tags @@ -32,7 +31,7 @@ $tag = isset($_GET['tag']) ? $_GET['tag'] : null; $uId = isset($_GET['uId']) ? (int)$_GET['uId'] : 0; $loadParentTags = isset($_GET['parent']) ? (bool)$_GET['parent'] : false; -$tags = explode(' ', trim($tag)); +$tags = explode(',', trim($tag)); if (count($tags) == 1 && $tags[0] == '') { //no tags $tags = array(); 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); <?php foreach($bookmarks['bookmarks'] as $bookmark): ?> <bm:Bookmark rdf:about="<?php echo createUrl('history', $bookmark['bHash']) ?>"> <dc:title><?php echo filter($bookmark['bTitle']) ?></dc:title> - <dc:created><?php echo filter($bookmark['bCreated']) ?></dc:created> + <dc:created><?php echo filter($bookmark['bDatetime']) ?></dc:created> <dc:description><?php echo filter(strip_tags($bookmark['bDescription'])) ?></dc:description> - <dc:date><?php echo $bookmark['bDateTime'] ?></dc:date> + <dc:date><?php echo $bookmark['bModified'] ?></dc:date> <bm:recalls rdf:resource="<?php echo filter($bookmark['bAddress']) ?>"/> <sioc:owner_of rdf:resource="<?php echo createUrl('profile', $usersArray[$bookmark['uId']]) ?>"/> <?php foreach($bookmark['tags'] as $tag): ?> 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/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()); diff --git a/www/tagrename.php b/www/tagrename.php index b07d49d..18e26ab 100644 --- a/www/tagrename.php +++ b/www/tagrename.php @@ -67,7 +67,7 @@ if (POST_CONFIRM) { $template = 'error.500.tpl'; } } elseif (POST_CANCEL) { - header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags)); + header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag)); } else { $tplVars['subtitle'] = T_('Rename Tag') .': '. $tag; $tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag; 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']; |