Woops, put the bookmark get* functions in the wrong file.

diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 1f8b548d1ffde7f8a1787f694e1fd8b2afd3ee3a..1f4f8d9621027d554d6c9f46b3110e0d12bbdfe6 100644 (file)
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -429,24 +429,6 @@ class BookmarkPlugin extends MicroAppPlugin
         $nli->out->elementEnd('div');
     }
 
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    public function getUrl()
-    {
-        if (empty($this->url)) {
-            throw new InvalidUrlException($this->url);
-        }
-        return $this->url;
-    }
-
     protected function showNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null)
     {
         $nb = Bookmark::fromStored($stored);

diff --git a/plugins/Bookmark/classes/Bookmark.php b/plugins/Bookmark/classes/Bookmark.php
index 95518631a3468cfb7536f646ec17d4cf44675335..87e81240d07b0bd9280e4401a1e82a7b3b1c2618 100644 (file)
--- a/plugins/Bookmark/classes/Bookmark.php
+++ b/plugins/Bookmark/classes/Bookmark.php
@@ -97,6 +97,24 @@ class Bookmark extends Managed_DataObject
         return self::getByPK(array('uri' => $stored->getUri()));
     }
 
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    public function getUrl()
+    {
+        if (empty($this->url)) {
+            throw new InvalidUrlException($this->url);
+        }
+        return $this->url;
+    }
+
     /**
      * Get the bookmark that a user made for an URL
      *