Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk

2 files changed, 7 insertions, 2 deletions

diff --git a/actions/disfavor.php b/actions/disfavor.php
index 3e3e4a547..d4a189d19 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -19,6 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+require_once INSTALLDIR.'/lib/favorform.php';
+
 class DisfavorAction extends Action
 {
 
@@ -74,7 +76,8 @@ class DisfavorAction extends Action
             $this->element('title', null, _('Add to favorites'));
             $this->elementEnd('head');
             $this->elementStart('body');
-            common_favor_form($notice);
+            $favor = new FavorForm($this, $notice);
+            $favor->show();
             $this->elementEnd('body');
             $this->elementEnd('html');
         } else {
diff --git a/actions/favor.php b/actions/favor.php
index afda93cff..92756366d 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -20,6 +20,7 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/mail.php');
+require_once INSTALLDIR.'/lib/disfavorform.php';
 
 class FavorAction extends Action
 {
@@ -73,7 +74,8 @@ class FavorAction extends Action
             $this->element('title', null, _('Disfavor favorite'));
             $this->elementEnd('head');
             $this->elementStart('body');
-            common_disfavor_form($notice);
+            $disfavor = new DisFavorForm($this, $notice);
+            $disfavor->show();
             $this->elementEnd('body');
             $this->elementEnd('html');
         } else {