From 6b48fd8f86cd4e6ee7309104bdb4e5b44b9b60c6 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 29 Jul 2009 15:33:09 -0400
Subject: move oEmbed router connection after plugins, so other endpoints (such
 as main/facebooklogin) from plugins don't get accidentally intercepted

---
 lib/router.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/router.php b/lib/router.php
index 8e4836497..e10d484f4 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -129,11 +129,6 @@ class Router
             $m->connect('index.php?action=' . $action, array('action' => $action));
         }
 
-        $m->connect('main/:method',
-                    array('action' => 'api',
-                          'method' => 'oembed(.xml|.json)?',
-                          'apiaction' => 'oembed'));
-
         // settings
 
         foreach (array('profile', 'avatar', 'password', 'openid', 'im',
@@ -480,6 +475,11 @@ class Router
 
         Event::handle('RouterInitialized', array($m));
 
+        $m->connect('main/:method',
+                    array('action' => 'api',
+                          'method' => 'oembed(.xml|.json)?',
+                          'apiaction' => 'oembed'));
+
         return $m;
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 3350770cc7d4636fa1c0942ed01d5f26a5faa66a Mon Sep 17 00:00:00 2001
From: Tom Adams <tom@holizz.com>
Date: Tue, 28 Jul 2009 06:19:02 +0100
Subject: Use <?php not <?.

---
 install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 901e502f1..334671599 100644
--- a/install.php
+++ b/install.php
@@ -77,7 +77,7 @@ function checkPrereqs()
 		if (!is_writable($fileFullPath)) {
     	     ?><p class="error">Cannot write <?php echo $fileSubdir; ?> directory: <code><?php echo $fileFullPath; ?></code></p>
 		       <p>On your server, try this command: <code>chmod a+w <?php echo $fileFullPath; ?></code></p>
-    	     <?
+	     <?php
 		     $pass = false;
 		}
 	}
-- 
cgit v1.2.3-54-g00ecf


From 605742f039752b90092594e0924c59121befc99c Mon Sep 17 00:00:00 2001
From: Tom Adams <tom@holizz.com>
Date: Tue, 28 Jul 2009 06:21:18 +0100
Subject: Pass $fancy to *_db_installer.

---
 install.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install.php b/install.php
index 334671599..c222afa7b 100644
--- a/install.php
+++ b/install.php
@@ -219,9 +219,9 @@ function handlePost()
     }
     
     switch($dbtype) {
-      case 'mysql':    mysql_db_installer($host, $database, $username, $password, $sitename);
+      case 'mysql':    mysql_db_installer($host, $database, $username, $password, $sitename, $fancy);
       break;
-      case 'pgsql':    pgsql_db_installer($host, $database, $username, $password, $sitename);
+      case 'pgsql':    pgsql_db_installer($host, $database, $username, $password, $sitename, $fancy);
       break;
       default:
     }
@@ -232,7 +232,7 @@ function handlePost()
 <?php
 }
 
-function pgsql_db_installer($host, $database, $username, $password, $sitename) {
+function pgsql_db_installer($host, $database, $username, $password, $sitename, $fancy) {
   $connstring = "dbname=$database host=$host user=$username";
 
   //No password would mean trust authentication used.
@@ -298,7 +298,7 @@ function pgsql_db_installer($host, $database, $username, $password, $sitename) {
       
 }
 
-function mysql_db_installer($host, $database, $username, $password, $sitename) {
+function mysql_db_installer($host, $database, $username, $password, $sitename, $fancy) {
   updateStatus("Starting installation...");
   updateStatus("Checking database...");
 
-- 
cgit v1.2.3-54-g00ecf


From 63e8f15448ac2cfb5217ddd96bb95821b6f106c5 Mon Sep 17 00:00:00 2001
From: Tom Adams <tom@holizz.com>
Date: Thu, 30 Jul 2009 00:12:18 +0100
Subject: /check-fancy now works when installed in root dir.

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 69c0bc1b2..a73983b59 100644
--- a/index.php
+++ b/index.php
@@ -108,7 +108,7 @@ function checkMirror($action_obj)
 function main()
 {
     // quick check for fancy URL auto-detection support in installer.
-    if (isset($_SERVER['REDIRECT_URL']) && ((dirname($_SERVER['REQUEST_URI']) . '/check-fancy') === $_SERVER['REDIRECT_URL'])) {
+    if (isset($_SERVER['REDIRECT_URL']) && (preg_replace("/^\/$/","",(dirname($_SERVER['REQUEST_URI']))) . '/check-fancy') === $_SERVER['REDIRECT_URL']) {
         die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
     }
     global $user, $action;
-- 
cgit v1.2.3-54-g00ecf