summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.php2
-rw-r--r--install.php10
-rw-r--r--lib/router.php10
3 files changed, 11 insertions, 11 deletions
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;
diff --git a/install.php b/install.php
index 901e502f1..c222afa7b 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;
}
}
@@ -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...");
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;
}