bookmarking

2 files changed, 41 insertions, 1 deletions

diff --git a/mod/bookmarks.php b/mod/bookmarks.php
new file mode 100644
index 000000000..25bf39a7a
--- /dev/null
+++ b/mod/bookmarks.php
@@ -0,0 +1,40 @@
+<?php
+
+function bookmarks_content(&$a) {
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+
+	require_once('include/menu.php');
+
+	$o = '<h3>' . t('My Bookmarks') . '</h3>';
+
+	$x = menu_list(local_user(),'',MENU_BOOKMARK);
+
+	if($x) {
+		foreach($x as $xx) {
+			$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
+			$o .= menu_render($y);
+		}
+	}
+
+	$o .= '<h3>' . t('My Connections Bookmarks') . '</h3>';
+
+
+	$x = menu_list(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK);
+
+	if($x) {
+		foreach($x as $xx) {
+			$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
+			$o .= menu_render($y);
+		}
+	}
+
+
+
+	return $o;
+
+}
+
diff --git a/mod/parse_url.php b/mod/parse_url.php
index c206c24ec..340e1a67e 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -252,7 +252,7 @@ function parse_url_content(&$a) {
 
 	logger('parse_url: ' . $url);
 
-	$template = $br . '[url=%s]%s[/url]%s' . $br;
+	$template = $br . '#^[url=%s]%s[/url]%s' . $br;
 
 	$arr = array('url' => $url, 'text' => '');