don't need 'bookmark' - keep it simple

This commit is contained in:
friendica 2012-10-22 19:57:55 -07:00
parent 21578fd0b0
commit 88be2eaaae
2 changed files with 3 additions and 4 deletions

View file

@ -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();

View file

@ -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' => '');