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

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

diff --git a/drupal-themedir2.patch b/drupal-themedir2.patch
index ca02b1b8fda5327e299ef05379fa25d89593427d..d9c6f8e73090c1b310ae04329eea9d4670c0f78c 100644 (file)
--- a/drupal-themedir2.patch
+++ b/drupal-themedir2.patch
@@ -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,6 @@
      // File is a template/theme
      // Load its CSS, if it exists
 -    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');
      }
    }