From 88be2eaaae55c79111d5e209eb823e6fd1e64f9c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 22 Oct 2012 19:57:55 -0700
Subject: don't need 'bookmark' - keep it simple

---
 mod/network.php   | 3 +--
 mod/parse_url.php | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mod/network.php b/mod/network.php
index b5c568b78..b431c67a1 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -187,7 +187,6 @@ function network_query_get_sel_tab($a) {
 	$no_active='';
 	$starred_active = '';
 	$new_active = '';
-	$bookmarked_active = '';
 	$all_active = '';
 	$search_active = '';
 	$conv_active = '';
@@ -275,7 +274,7 @@ function network_content(&$a, $update = 0, $load = false) {
 	// TODO: fix this logic, reduce duplication
 	//$a->page['content'] .= '<div class="tabs-wrapper">';
 	
-	list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
+	list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $spam_active) = network_query_get_sel_tab($a);
 	// if no tabs are selected, defaults to comments
 	if ($no_active=='active') $all_active='active';
 	//echo "<pre>"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 9adee8f65..14b920b23 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -264,9 +264,9 @@ function parse_url_content(&$a) {
 	logger('parse_url: ' . $url);
 
 	if($textmode)
-		$template = $br . '[bookmark=%s]%s[/bookmark]%s' . $br;
+		$template = $br . '[url=%s]%s[/url]%s' . $br;
 	else
-		$template = "<br /><a class=\"bookmark\" href=\"%s\" >%s</a>%s<br />";
+		$template = "<br /><a href=\"%s\" >%s</a>%s<br />";
 
 	$arr = array('url' => $url, 'text' => '');
 
-- 
cgit v1.2.3