SOURCES (DEVEL): drupal-sitesdir.patch, drupal-themedir2.patch - u...

[glen]

Author: glen                         Date: Fri Jan 26 14:10:16 2007 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- update to 5.0

---- Files affected:
SOURCES:
   drupal-sitesdir.patch (1.2 -> 1.2.2.1) , drupal-themedir2.patch (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/drupal-sitesdir.patch
diff -u SOURCES/drupal-sitesdir.patch:1.2 SOURCES/drupal-sitesdir.patch:1.2.2.1
--- SOURCES/drupal-sitesdir.patch:1.2	Mon Dec  5 13:03:07 2005
+++ SOURCES/drupal-sitesdir.patch	Fri Jan 26 15:10:10 2007
@@ -1,12 +1,11 @@
-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 @@
+--- drupal-5.0/includes/bootstrap.inc~	2007-01-26 13:05:53.697188263 +0200
++++ drupal-5.0/includes/bootstrap.inc	2007-01-26 13:06:43.528313680 +0200
+@@ -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['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_FILENAME']);
+   $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
    for ($i = count($uri) - 1; $i > 0; $i--) {

================================================================
Index: SOURCES/drupal-themedir2.patch
diff -u SOURCES/drupal-themedir2.patch:1.1 SOURCES/drupal-themedir2.patch:1.1.2.1
--- SOURCES/drupal-themedir2.patch:1.1	Wed Jul  6 17:45:28 2005
+++ SOURCES/drupal-themedir2.patch	Fri Jan 26 15:10:11 2007
@@ -1,11 +1,10 @@
---- ../includes/theme.inc	2005-05-20 16:55:04.000000000 +0300
-+++ /tmp/theme.inc	2005-05-21 15:10:45.000000000 +0300
-@@ -74,7 +74,7 @@
-   else {
+--- drupal-5.0/includes/theme.inc~	2007-01-26 13:09:14.801730081 +0200
++++ drupal-5.0/includes/theme.inc	2007-01-26 13:09:52.242575644 +0200
+@@ -65,6 +65,7 @@
      // File is a template/theme
      // Load its CSS, if it exists
--    if (file_exists($stylesheet = dirname($themes[$theme]->filename) .'/style.css')) {
+     if (file_exists($stylesheet = dirname($themes[$theme]->filename) .'/style.css')) {
 +    if (file_exists('htdocs/' . ($stylesheet = dirname($themes[$theme]->filename) .'/style.css'))) {
-       theme_add_style($stylesheet);
+       drupal_add_css($stylesheet, 'theme');
      }
    }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/drupal-sitesdir.patch?r1=1.2&r2=1.2.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/drupal-themedir2.patch?r1=1.1&r2=1.1.2.1&f=u