From 2287f29c57e5af767fbc7407c5bfe8c7e32eee9f Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Thu, 22 Sep 2011 09:27:36 -0400
Subject: [PATCH 1/2] Update RTL stylesheet for neo.

---
 theme/neo/css/rtl.css | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/theme/neo/css/rtl.css b/theme/neo/css/rtl.css
index e677e7f6e6..f1187c64d1 100644
--- a/theme/neo/css/rtl.css
+++ b/theme/neo/css/rtl.css
@@ -85,6 +85,10 @@ address{
     margin-left: 0;
 }
 
+.notice p.entry-content {
+    float: left;
+}
+
 .threaded-replies .form_notice #notice_action-submit {
     right: 10px;
 }
@@ -264,6 +268,29 @@ select {
     float: left;
 }
 
+.profile .entity_profile .fn, .profile .entity_profile .label {
+    margin-right: 11px;
+    margin-left: 0;
+}
+
+#core .vcard .photo {
+    float: right;
+}
+
+.profile_list .label {
+    margin-right: 59px !important;
+}
+
+.profile .entity_profile .note, .profile .entity_profile .url, .profile .entity_profile .entity_tags, .profile .entity_profile .form_subscription_edit {
+    margin-right: 59px;
+    margin-left: 0;
+}
+
+.profile_list .entity_actions ul {
+    left: 20px;
+    right: auto;
+}
+
 /*#site_nav_local_views {
     float: right;
 }
@@ -273,3 +300,4 @@ select {
 }*/
 
 
+

From 4c91dc45469b1f60bacd015e3e4e4cb36cd90abe Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 22 Sep 2011 12:49:04 -0700
Subject: [PATCH 2/2] Use array_merge instead of array_replace (same effect,
 and array_merge works with PHP versions < 5.3)

fixes http://status.net/open-source/issues/3393
---
 lib/siteprofile.php | 8 ++++----
 lib/statusnet.php   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/siteprofile.php b/lib/siteprofile.php
index 51ce907b19..b5c6fc304c 100644
--- a/lib/siteprofile.php
+++ b/lib/siteprofile.php
@@ -90,7 +90,7 @@ class PublicSite extends SiteProfileSettings
         global $config;
         return array(
             // We only want to change these values, not replace entire 'site' array
-            'site' => array_replace(
+            'site' => array_merge(
                 $config['site'], array(
                     'inviteonly' => false,
                     'private'    => false,
@@ -137,7 +137,7 @@ class PrivateSite extends SiteProfileSettings
         global $config;
         return array(
             // We only want to change these values, not replace entire 'site' array
-            'site' => array_replace(
+            'site' => array_merge(
                 $config['site'], array(
                     'inviteonly' => true,
                     'private'    => true,
@@ -200,7 +200,7 @@ class CommunitySite extends SiteProfileSettings
         global $config;
         return array(
             // We only want to change these values, not replace entire 'site' array
-            'site' => array_replace(
+            'site' => array_merge(
                 $config['site'], array(
                     'private'    => false,
                     'closed'     => false
@@ -245,7 +245,7 @@ class SingleuserSite extends SiteProfileSettings
         return array(
             'singleuser' => array('enabled' => true),
             // We only want to change these values, not replace entire 'site' array
-            'site' => array_replace(
+            'site' => array_merge(
                 $config['site'], array(
                     'private'    => false,
                     'closed'     => true,
diff --git a/lib/statusnet.php b/lib/statusnet.php
index e4fb60ec7c..bffa625773 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -310,7 +310,7 @@ class StatusNet
     {
         global $config;
         $settings = SiteProfile::getSettings($name);
-        $config = array_replace($config, $settings);
+        $config = array_merge($config, $settings);
     }
 
     protected function _sn_to_path($sn)