Widgets require Action not HTMLOutputter (getScoped)

diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
index 143675063cb1f996c5c74681784c1516aa5d186c..76e2edb7cec4cde00fd0956e28ac068c26f63266 100644 (file)
--- a/lib/accountprofileblock.php
+++ b/lib/accountprofileblock.php
@@ -51,7 +51,7 @@ class AccountProfileBlock extends ProfileBlock
     protected $profile = null;
     protected $user    = null;
 
-    function __construct(HTMLOutputter $out, Profile $profile)
+    function __construct(Action $out, Profile $profile)
     {
         parent::__construct($out);
         $this->profile = $profile;

diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
index 7e4380e1bcdbd97d6a14c8c34da3ca9a84a7cb85..485dd149458e099130a88d5a275d13eed86a21c7 100644 (file)
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@@ -65,7 +65,7 @@ class NoticeListItem extends Widget
      *
      * @param Notice $notice The notice we'll display
      */
-    function __construct(Notice $notice, HTMLOutputter $out=null)
+    function __construct(Notice $notice, Action $out=null)
     {
         parent::__construct($out);
         if (!empty($notice->repeat_of)) {

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index bf5329e33b74a60390f1e0095fd5ef291dc061de..e2f9f0955fea5427c2c359b0a0e80413758106e0 100644 (file)
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -50,7 +50,7 @@ class ThreadedNoticeList extends NoticeList
 {
     protected $userProfile;
 
-    function __construct(Notice $notice, HTMLOutputter $out=null, $profile=-1)
+    function __construct(Notice $notice, Action $out=null, $profile=-1)
     {
         parent::__construct($notice, $out);
         if (is_int($profile) && $profile == -1) {
@@ -174,7 +174,7 @@ class ThreadedNoticeListItem extends NoticeListItem
 {
     protected $userProfile = null;
 
-    function __construct(Notice $notice, HTMLOutputter $out=null, $profile=null)
+    function __construct(Notice $notice, Action $out=null, $profile=null)
     {
         parent::__construct($notice, $out);
         $this->userProfile = $profile;
@@ -340,7 +340,7 @@ class ThreadedNoticeListMoreItem extends NoticeListItem
 {
     protected $cnt;
 
-    function __construct(Notice $notice, HTMLOutputter $out, $cnt)
+    function __construct(Notice $notice, Action $out, $cnt)
     {
         parent::__construct($notice, $out);
         $this->cnt = $cnt;

diff --git a/lib/widget.php b/lib/widget.php
index 78472dd4d8d557594df45b8c84f6eff235898abf..1ccd1e252b2f74344d60742f058a2858adb1f668 100644 (file)
--- a/lib/widget.php
+++ b/lib/widget.php
@@ -54,7 +54,7 @@ class Widget
     protected $avatarSize = AVATAR_STREAM_SIZE;
 
     /**
-     * HTMLOutputter to use for output
+     * Action (HTMLOutputter) to use for output
      */
 
     var $out = null;
@@ -62,10 +62,10 @@ class Widget
     /**
      * Prepare the widget for use
      *
-     * @param HTMLOutputter $out output helper, defaults to null
+     * @param Action $out output helper, defaults to null
      */
 
-    function __construct(HTMLOutputter $out=null)
+    function __construct(Action $out=null)
     {
         $this->out = $out;
     }