Merge ../csarven into uiredesign

Conflicts:

	lib/action.php

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/noticelist.php b/lib/noticelist.php
index fb3e66f9f..0fc6d513f 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -229,9 +229,11 @@ class NoticeListItem extends Widget
         $user = common_current_user();
         if ($user) {
             if ($user->hasFave($this->notice)) {
-                common_disfavor_form($this->notice);
+		$disfavor = new DisfavorForm($this->out, $this->notice);
+		$disfavor->show();
             } else {
-                common_favor_form($this->notice);
+		$favor = new FavorForm($this->out, $this->notice);
+		$favor->show();
             }
         }
     }