Merge branch 'uiredesign' of ../evan into uiredesign

diff --git a/actions/public.php b/actions/public.php
index e00f8efbaf27870016825d8fd6ba39886db4ba47..b13678bf0cbb9b89423d395368468b3525de7da4 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -31,6 +31,8 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR.'/lib/publicgroupnav.php';
+
 /**
  * Action for displaying the public stream
  *

diff --git a/lib/action.php b/lib/action.php
index 5f6c600b1311f5aee88d85e7abdc8f3d588cdeda..4b9db465257f9addc4edce9540c9658e491ca19c 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -278,7 +278,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showNoticeForm()
     {
-        $notice_form = new NoticeForm();
+        $notice_form = new NoticeForm($this);
         $notice_form->show();
     }