From c3332e10712c0ec7f3540e54c794fa4dae3532f9 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 20 Oct 2010 23:46:46 +0000 Subject: Refs #2551 - merged [7051] and [7053] into trunk git-svn-id: http://code.elgg.org/elgg/trunk@7112 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/bookmarks/views/default/object/bookmarks.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'mod/bookmarks/views/default/object') diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 67ba1bd91..4dcb53605 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -11,7 +11,15 @@ $owner = $vars['entity']->getOwnerEntity(); $friendlytime = elgg_view_friendly_time($vars['entity']->time_created); -$parsed_url = parse_url($vars['entity']->address); +$address = $vars['entity']->address; + +// you used to be able to add without titles, which created unclickable bookmarks +// putting a fake title in so you can click on it. +if (!$title = $vars['entity']->title) { + $title = elgg_echo('bookmarks:no_title'); +} + +$parsed_url = parse_url($address); $faviconurl = $parsed_url['scheme'] . "://" . $parsed_url['host'] . "/favicon.ico"; //sort out the access level for display @@ -51,7 +59,7 @@ if (@file_exists($faviconurl)) { //delete if($vars['entity']->canEdit()){ -$delete .= "" . elgg_view('output/confirmlink',array( + $delete .= "" . elgg_view('output/confirmlink',array( 'href' => $vars['url'] . "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->guid, 'text' => elgg_echo("delete"), 'confirm' => elgg_echo("bookmarks:delete:confirm"), @@ -72,7 +80,7 @@ if($vars['entity']->canEdit()){ $info .= ""; -$info .= "

address}\" target=\"_blank\">{$vars['entity']->title}

"; +$info .= "

{$title}

"; $info .= "

Bookmarked by username}\">{$owner->name} {$friendlytime} {$view_notes}

"; $tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags)); -- cgit v1.2.3