From f753258a749c8bad8391a5f673676ee46600fe5d Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Tue, 5 Apr 2011 13:23:41 -0400
Subject: [PATCH 1/3] Style for best QnA answer.

---
 theme/neo/css/display.css    |   5 +++++
 theme/neo/images/rosette.png | Bin 0 -> 673 bytes
 2 files changed, 5 insertions(+)
 create mode 100644 theme/neo/images/rosette.png

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 61258bfab6..555b280825 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -1408,4 +1408,9 @@ table.profile_list tr.alt {
     margin-top: 0px;
 }
 
+.question p.best {
+    background: url(../images/rosette.png) no-repeat top left;
+    padding-left: 20px;
+}
+
 }/*end of @media screen, projection, tv*/
diff --git a/theme/neo/images/rosette.png b/theme/neo/images/rosette.png
new file mode 100644
index 0000000000000000000000000000000000000000..f233bc77053bf3d4b0c8fafd2a9c58bf34603b61
GIT binary patch
literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!Gf6~2R5;6p
zlS^+BQ5c3#+i6<pqUoaTMmJqhC}p?|RL9nsXswqRi^O`vYA6C#5{*Qy3x7c4(m&$D
zy??`nE{uY~kN|?iFmulF^&6;3b)YWZ%)DpL`+VP=3j@FgiBC;E<KyF&h{sLN*rj3f
z{thwb5eo|)dO~hqgWS$QW^)k7jzc68u)N;#{{U}f>N@1p=a9KakdI4{r9Fsj0rE)+
zb~J|8<YayzfLeYnf-2;VG(<WBLqCH?Tt_o@62{6Z_^rDTJ9$_$GnUDi<^l+xPso?A
zsB)14YcS%cU~4+;*a=vX1kC6P1pN|Uzko&{P;+-MGSZaEEeKMRLQYUbC=`x^hhpd~
zM<BOuqno~mZ`0Fd7r@rErYyaH%;eCfiaeZvP&J6<D0naoGoV6TNusN-qM|5o-GI3{
z*;}-o96C|zfU5Ff1bj(_?GN<;GQW$?_I*_S{_ie;F+cyVtx?rN5q#q^Oahora4|^X
z5ID8o+DziBZxJ6E+Z(uzt=ZZ4-DC>lW*Tz02$`Zaxk^6sfOa5<Y9xwJigIq~IjA$X
zR2~~cZS6FSjf>!ghcM1=puT<{WmU!JK!6{4kb3fZrJ*ROjE>@quHyr}*Cr;=Aa64!
zj|O-=Sx^U(hAq-h=kq`Q2V>dc0LCnFFu6l&F;*d8IpiIHH4yNNu{%yB`v73}L;K|S
z5BXjfZJO%>P`FNNQN^m$1zjx5c5Y{17VpEWq!t0|e{#P8+?shbj%;~D00000NkvXX
Hu0mjf+-WMY

literal 0
HcmV?d00001


From 2d2c134a1f464021f2b3d3837eac95521ac02af5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 5 Apr 2011 13:28:41 -0400
Subject: [PATCH 2/3] fix constructor error in FileNoticeStream

---
 lib/filenoticestream.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/filenoticestream.php b/lib/filenoticestream.php
index 8c01893634..2b5e53eaf7 100644
--- a/lib/filenoticestream.php
+++ b/lib/filenoticestream.php
@@ -60,7 +60,6 @@ class RawFileNoticeStream extends NoticeStream
 
     function __construct($file)
     {
-        parent::__construct();
         $this->file = $file;
     }
 

From 4b9c3335d49f695f7f9d4490472ff7100dd38978 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 5 Apr 2011 13:30:05 -0400
Subject: [PATCH 3/3] default to private sites

---
 lib/default.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/default.php b/lib/default.php
index 9872d8ffd3..6c7b18bccd 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -53,7 +53,7 @@ $default =
               'broughtbyurl' => null,
               'closed' => false,
               'inviteonly' => false,
-              'private' => false,
+              'private' => true,
               'ssl' => 'never',
               'sslserver' => null,
               'shorturllength' => 30,
@@ -301,12 +301,14 @@ $default =
         array('disabled' => true),
         'plugins' =>
         array('default' => array('Geonames' => null,
-                                 'Mapstraction' => null,
-                                 'OStatus' => null,
-                                 'WikiHashtags' => null,
-                                 'RSSCloud' => null,
                                  'ClientSideShorten' => null,
                                  'StrictTransportSecurity' => null,
+                                 'Bookmark' => null,
+                                 'Event' => null,
+                                 'Poll' => null,
+                                 'QnA' => null,
+                                 'SearchSub' => null,
+                                 'TagSub' => null,
                                  'OpenID' => null),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
               'server' => null,