From 7f0c7e8e80485d0417fcac0346899f3fe092abf3 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Thu, 3 Jul 2014 14:02:01 +0200
Subject: [PATCH] Widgets require Action not HTMLOutputter (getScoped)

---
 lib/accountprofileblock.php | 2 +-
 lib/noticelistitem.php      | 2 +-
 lib/threadednoticelist.php  | 6 +++---
 lib/widget.php              | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
index 143675063c..76e2edb7ce 100644
--- 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 7e4380e1bc..485dd14945 100644
--- 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 bf5329e33b..e2f9f0955f 100644
--- 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 78472dd4d8..1ccd1e252b 100644
--- 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;
     }
-- 
2.39.5