- merged 5.7 from DEVEL: cvs up -j HEAD -j DEVEL, except manually re-merged changelog...

[packages/drupal.git] / drupal-sitesdir.patch

diff --git a/drupal-sitesdir.patch b/drupal-sitesdir.patch
index c0ebc8ab33c49cfd462493551ebcd004fe9ccfdb..9a34b664175a68bd06944d31163d2c7b6af570b3 100644 (file)
--- a/drupal-sitesdir.patch
+++ b/drupal-sitesdir.patch
@@ -1,12 +1,12 @@
-diff -ur ./includes/bootstrap.inc ../drupal1/includes/bootstrap.inc
---- ./includes/bootstrap.inc   2005-04-05 22:00:24.000000000 +0300
-+++ ./drupal1/includes/bootstrap.inc   2005-05-19 18:20:06.845355509 +0300
-@@ -48,7 +48,7 @@
+diff -uNdr drupal-5.7.old1/includes/bootstrap.inc drupal-5.7/includes/bootstrap.inc
+--- drupal-5.7.old1/includes/bootstrap.inc     2008-02-16 16:02:23.000000000 +0100
++++ drupal-5.7/includes/bootstrap.inc  2008-02-16 16:06:30.000000000 +0100
+@@ -199,7 +199,7 @@
      return $conf;
    }
  
 -  $confdir = 'sites';
 +  $confdir = '/etc/webapps/drupal/sites';
-   $uri = explode('/', $_SERVER['PHP_SELF']);
-   $server = explode('.', rtrim($_SERVER['HTTP_HOST'], '.'));
+   $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
+   $server = explode('.', implode('.', array_reverse(explode(':', rtrim(@$_SERVER['HTTP_HOST'], '.')))));
    for ($i = count($uri) - 1; $i > 0; $i--) {