2 files changed, 5 insertions, 7 deletions
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 2cc82d457..2e37e0315 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -36,9 +36,8 @@ class SubscribersAction extends GalleryAction {
 		}
 	}
 
-	function define_subs(&$subs, &$profile) {
-		$subs->subscribed = $profile->id;
-		$subs->whereAdd('subscriber != ' . $profile->id);
+	function fields() {
+		return array('subscriber', 'subscribed');
 	}
 
 	function div_class() {
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 5566acb41..aebfa22e8 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -36,9 +36,8 @@ class SubscriptionsAction extends GalleryAction {
 		}
 	}
 
-	function define_subs(&$subs, &$profile) {
-		$subs->subscriber = $profile->id;
-		$subs->whereAdd('subscribed != ' . $profile->id);
+	function fields() {
+		return array('subscribed', 'subscriber');
 	}
 
 	function div_class() {
@@ -48,4 +47,4 @@ class SubscriptionsAction extends GalleryAction {
 	function get_other(&$subs) {
 		return $subs->subscribed;
 	}
-}
-\ No newline at end of file
+}