Changeset 607 for trunk/plog-load-config.php

Timestamp:

11/12/09 18:41:57 (10 months ago)

Author:

sidtheduck

Message:

First round of RC-1 bug fixes

• Fix for double slashes when included in root directory (including fix for Windows servers)
• Fix for add_album() returning nil or '0' id due to missing database handler when calling mysql_insert_id()
• Removal of unneeded code in latest comments plugin

File:

• trunk/plog-load-config.php (modified) (1 diff)

trunk/plog-load-config.php

@@ -94 +94 @@
 // if mod_rewrite is on and we're not embedded, remove the file basename
 if ($config['use_mod_rewrite'] == 1 && $config['embedded'] == 0) {
-        $config['baseurl'] = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/';
+        $config['baseurl'] = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
+        // Verify URL for a trailing slash.  If not, add one.
+        if ($config['baseurl']{strlen($config['baseurl'])-1} != '/') {
+                $config['baseurl'] = $config['baseurl'].'/';
+        }
 // otherwise just use our cleaned up version of $_SERVER['PHP_SELF'] from plog-globals.php
 } else {