Moved things into directories to allow for easier pear packaging. Closes #13

daaku · daaku · commit 049081dfd862 · 2010-04-24T20:36:01.000Z
diff --git a/examples/example.php b/examples/example.php
@@ -1,6 +1,6 @@
 <?php
 
-require './facebook.php';
+require '../src/facebook.php';
 
 // Create our Application instance.
 $facebook = new Facebook(array(
diff --git a/readme.md b/readme.md
@@ -44,7 +44,7 @@ Logged in vs Logged out:
       echo '<a href="' . $facebook->getLoginUrl() . '">Login</a>';
     }
 
-[examples]: php-sdk/tree/master/index.php
+[examples]: php-sdk/tree/master/examples/example.php
 [API]: http://developers.facebook.com/docs/api
 
 
diff --git a/src/facebook.php b/src/facebook.php
diff --git a/tests/tests.php b/tests/tests.php
@@ -1,6 +1,6 @@
 <?php
 
-require './facebook.php';
+require 'facebook.php';
 
 /**
  * @owner naitik
@@ -424,6 +424,12 @@ public function testLoginStatusURLCustom() {
   }
 
   public function testMagicQuotesQueryString() {
+    if (!get_magic_quotes_gpc()) {
+      // this test cannot run without get_magic_quotes_gpc(), and the setting
+      // cannot be modified at runtime, so we're shit out of luck. thanks php.
+      return;
+    }
+
     // @style-override allow json_encode call
     $_GET['session'] = addslashes(json_encode(self::$VALID_EXPIRED_SESSION));
     $facebook = new Facebook(array(
@@ -437,6 +443,12 @@ public function testMagicQuotesQueryString() {
   }
 
   public function testMagicQuotesCookie() {
+    if (!get_magic_quotes_gpc()) {
+      // this test cannot run without get_magic_quotes_gpc(), and the setting
+      // cannot be modified at runtime, so we're shit out of luck. thanks php.
+      return;
+    }
+
     $cookieName = 'fbs_' . self::APP_ID;
     $session = self::$VALID_EXPIRED_SESSION;
     $_COOKIE[$cookieName] = addslashes('"' . http_build_query($session) . '"');
@@ -505,7 +517,7 @@ public function testSecureCurrentUrlWithNonDefaultPort() {
   public function testIgnoreArgSeparatorForCookie() {
     $cookieName = 'fbs_' . self::APP_ID;
     $session = self::$VALID_EXPIRED_SESSION;
-    $_COOKIE[$cookieName] = addslashes('"' . http_build_query($session) . '"');
+    $_COOKIE[$cookieName] = '"' . http_build_query($session) . '"';
     ini_set('arg_separator.output', '&amp;');
     // ensure we're testing what we expect
     $this->assertEquals(http_build_query(array('a' => 1, 'b' => 2)),

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ Logged in vs Logged out:`
`44`	`44`	`echo '<a href="' . $facebook->getLoginUrl() . '">Login</a>';`
`45`	`45`	`}`
`46`	`46`
`47`		`-[examples]: php-sdk/tree/master/index.php`
	`47`	`+[examples]: php-sdk/tree/master/examples/example.php`
`48`	`48`	`[API]: http://developers.facebook.com/docs/api`
`49`	`49`
`50`	`50`