What just happened? Not sure if me or git caused duplicate code.

diff --git a/classes/Notice.php b/classes/Notice.php
index b22b4296e0c8c3464fd72683a78194652cb5f62c..89c30d25fde879712288658372387180ac720bd0 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -3267,27 +3267,4 @@ class Notice extends Managed_DataObject
     public function setPref($namespace, $topic, $data) {
         return Notice_prefs::setData($this, $namespace, $topic, $data);
     }
-
-    public function delPref($namespace, $topic) {
-        return Notice_prefs::setData($this, $namespace, $topic, null);
-    }
-
-    public function getPref($namespace, $topic, $default=null) {
-        // If you want an exception to be thrown, call Notice_prefs::getData directly
-        try {
-            return Notice_prefs::getData($this, $namespace, $topic, $default);
-        } catch (NoResultException $e) {
-            return null;
-        }
-    }
-
-    // The same as getPref but will fall back to common_config value for the same namespace/topic
-    public function getConfigPref($namespace, $topic)
-    {
-        return Notice_prefs::getConfigData($this, $namespace, $topic);
-    }
-
-    public function setPref($namespace, $topic, $data) {
-        return Notice_prefs::setData($this, $namespace, $topic, $data);
-    }
 }