From 098f9bb762e03f862a8ba39396b584fdc6e76e52 Mon Sep 17 00:00:00 2001
From: Swen Kooij <nuser1@live.com>
Date: Wed, 19 Dec 2012 21:03:46 +0100
Subject: [PATCH 1/5] added require_once to prevent multiple inclusions.

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index ebbe667e..b1cd4af5 100644
--- a/readme.md
+++ b/readme.md
@@ -15,7 +15,7 @@ Usage
 The [examples][examples] are a good place to start. The minimal you'll need to
 have is:
 
-    require 'facebook-php-sdk/src/facebook.php';
+    require_once 'facebook-php-sdk/src/facebook.php';
 
     $facebook = new Facebook(array(
       'appId'  => 'YOUR_APP_ID',

From d2876082be1848c42f632d57c49fa48f3e2eb573 Mon Sep 17 00:00:00 2001
From: Swen Kooij <nuser1@live.com>
Date: Wed, 19 Dec 2012 21:04:48 +0100
Subject: [PATCH 2/5] Fixed checking for active session

It was broken and did not work.
---
 src/facebook.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/facebook.php b/src/facebook.php
index a2238ef6..3093edfb 100644
--- a/src/facebook.php
+++ b/src/facebook.php
@@ -45,7 +45,7 @@ class Facebook extends BaseFacebook
    * @see BaseFacebook::__construct in facebook.php
    */
   public function __construct($config) {
-    if (!session_id()) {
+    if (strlen(session_id()) > 1)  {
       session_start();
     }
     parent::__construct($config);

From d6b38057e06dd4a26ee5f93d47875a80d8203e56 Mon Sep 17 00:00:00 2001
From: Swen Kooij <nuser1@live.com>
Date: Fri, 14 Dec 2012 11:04:42 +0100
Subject: [PATCH 3/5] Added useragent to config array in the construtor

You can now specify a custom useragent in the $config array in the constructor.
---
 src/base_facebook.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/base_facebook.php b/src/base_facebook.php
index 82758192..47cccd73 100644
--- a/src/base_facebook.php
+++ b/src/base_facebook.php
@@ -150,7 +150,7 @@ abstract class BaseFacebook
   /**
    * Maps aliases to Facebook domains.
    */
-  public static $DOMAIN_MAP = array(
+  public $DOMAIN_MAP = array(
     'api'         => 'https://api.facebook.com/',
     'api_video'   => 'https://api-video.facebook.com/',
     'api_read'    => 'https://api-read.facebook.com/',
@@ -231,6 +231,14 @@ public function __construct($config) {
     if (isset($config['trustForwarded']) && $config['trustForwarded']) {
       $this->trustForwarded = true;
     }
+    if(isset($config['useragent'])) {
+        $CURL_OPTS = array(
+          CURLOPT_CONNECTTIMEOUT => 10,
+          CURLOPT_RETURNTRANSFER => true,
+          CURLOPT_TIMEOUT        => 60,
+          CURLOPT_USERAGENT      => $config['useragent'],
+      );
+    }
     $state = $this->getPersistentData('state');
     if (!empty($state)) {
       $this->state = $state;

From 9adfc2d2a49a5a1d878d9d4c32a6734ae04f313d Mon Sep 17 00:00:00 2001
From: Swen Kooij <nuser1@live.com>
Date: Fri, 14 Dec 2012 11:06:04 +0100
Subject: [PATCH 4/5] Made $CURL_OPTS non-static

---
 src/base_facebook.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/base_facebook.php b/src/base_facebook.php
index 47cccd73..8c1e31c9 100644
--- a/src/base_facebook.php
+++ b/src/base_facebook.php
@@ -130,7 +130,7 @@ abstract class BaseFacebook
   /**
    * Default options for curl.
    */
-  public static $CURL_OPTS = array(
+  public $CURL_OPTS = array(
     CURLOPT_CONNECTTIMEOUT => 10,
     CURLOPT_RETURNTRANSFER => true,
     CURLOPT_TIMEOUT        => 60,

From e806a95a3da945daf8e09328a531af766929a3ce Mon Sep 17 00:00:00 2001
From: Swen Kooij <swenkooij@gmail.com>
Date: Fri, 14 Dec 2012 12:13:36 +0100
Subject: [PATCH 5/5] Updated readme.md

It's recommend to use require_once instead of require. To prevent
multiple inclusions.
---
 .DS_Store | Bin 0 -> 6148 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5606d743a25de7ac753c1c714546eac0baf7d218
GIT binary patch
literal 6148
zcmeH~&r8EF6vq=cHS-7bBIqr69@65N9z2vX!K2W@4o<YS;tHi5ZRZZ7TJbONKk={e
z@A17P1*bcU$O|Ojm%Nvx`9Sl7F~+@F<S=G2#sp+kj>d|F%`07NCK#3D7{xS9vJh(T
z;nev4y5P6BSiy337tX(ae-am^ZGZ5!R(pM8Q;03GGakihl+C?tmPW;uKgs5P9NmXO
zey!{>C})Ki<jQjyloRkMdzfVj*kcntilcIJV;w9Oj@|2ZrDNMwS1wLZ`d!&~j;pHE
z5gqGI>>VDRT?~Wj>A8N<7&%Z@Y1e2YuV9!}Jo<T>Wa$I6G|^2IDG?w7M1Tko0VH6~
z2eC~!hyW2F0^bPW{vaWvx<+fQYU_Xkug~ajqhbOZ-x8?OsB5&=3LZ#YcLmj5xp`u6
z-5uJciF1wCT6K5E)yy!CnYnqqa5X!$OBK$ztCdP3Km?Wvv~<<N^Zy)vnU#<H<t|hs
z0z}}S5#a5CKk#5t=4}13JUnY9<Xgy?Fs?=e64*<Z0I1+Tvag)lFVTiL*J!O3N5OX0
Q9h5Et3J4WM;1>vd0u#bU^Z)<=

literal 0
HcmV?d00001