From b2c28faf526e55ddc97d42692048e644b004e1f8 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 26 May 2009 21:14:42 +0000
Subject: Removed silly "dented:" status prefix from Facebook App

---
 actions/facebookhome.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index 5946e6c98..4c2b26355 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -138,9 +138,6 @@ class FacebookhomeAction extends FacebookAction
 
     function setDefaults()
     {
-        // A default prefix string for notices
-        $this->facebook->api_client->data_setUserPreference(
-            FACEBOOK_NOTICE_PREFIX, 'dented: ');
         $this->facebook->api_client->data_setUserPreference(
             FACEBOOK_PROMPTED_UPDATE_PREF, 'false');
     }
-- 
cgit v1.2.3-54-g00ecf


From 2b81dcb25329c496c7c4f2c99334b79ba0421c1e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Fri, 15 May 2009 21:44:58 +0000
Subject: Better err handling when trying to get Facebook client

---
 lib/facebookutil.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index ec3987273..242d2e06f 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -27,9 +27,21 @@ define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
 
 function getFacebook()
 {
+    static $facebook = null;
+
     $apikey = common_config('facebook', 'apikey');
     $secret = common_config('facebook', 'secret');
-    return new Facebook($apikey, $secret);
+
+    if ($facebook === null) {
+        $facebook = new Facebook($apikey, $secret);
+    }
+
+    if (!$facebook) {
+        common_log(LOG_ERR, 'Could not make new Facebook client obj!',
+            __FILE__);
+    }
+
+    return $facebook;
 }
 
 function updateProfileBox($facebook, $flink, $notice) {
@@ -92,7 +104,6 @@ function isFacebookBound($notice, $flink) {
 
 }
 
-
 function facebookBroadcastNotice($notice)
 {
     $facebook = getFacebook();
-- 
cgit v1.2.3-54-g00ecf