Index: gallery_base.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gallery/gallery_base.inc,v
retrieving revision 1.6.2.14
diff -u -r1.6.2.14 gallery_base.inc
--- gallery_base.inc	30 May 2007 14:49:27 -0000	1.6.2.14
+++ gallery_base.inc	31 May 2007 19:36:58 -0000
@@ -278,27 +278,42 @@
  */
 function gallery_set_css($css) {
   if (count($css)) {
-    $css = preg_replace('/<link(.*?)href="([^"]*)"([^\/]*)\/>/i', '${2}', $css);
+    $css = preg_replace('/<link(.*?)href="([^"]*)"(.*?)\/>/i', '${2}', $css);
     foreach ($css as $include) {
-      // Gallery's CSS will always be added first, what allows overriding in the module(s)
-      drupal_add_css(substr($include, strlen(base_path())), 'module', 'all', FALSE);
+      // Check for inline CSS
+      if (strstr(trim($include), '<style')) {
+        // drupal_add_css() currently does not support inline styles
+        drupal_set_html_head($include);
+      }
+      else {
+        // drupal_add_link adds the link reference
+        $attributes['rel'] = "stylesheet";
+        $attributes['type'] = "text/css";
+        $attributes['href'] = $include;
+        drupal_add_link($attributes);
+      }
     }
   }
 }
 
 /**
  * Implementation of gallery_set_javascript
- * (druapl_add_js() ensures proper cascading of included G2 javascript)  
+ * (drupal_add_js() ensures proper cascading of included G2 javascript)  
  */
 function gallery_set_javascript($javascript) {
   if (!empty($javascript)) {
+    // Separate inline javascript from javascript files
     $files = preg_grep('/<script(.*?)src=/i', $javascript);
+    // Inline JS
     $inline = array_diff($javascript, $files);
     $inline = preg_replace('/<script([^>]*)>([^<]*)<\/script>/i', '${2}', $inline);
     drupal_add_js(implode("\n", $inline), 'inline');
+    // JS files
     $files = preg_replace('/<script(.*?)src="([^"]*)"([^>]*)>(.*?)<\/script>/i', '${2}', $files);
     foreach ($files as $include) {
-      drupal_add_js(substr($include, strlen(base_path())));
+//      $include = preg_replace("/^".preg_quote(base_path(),'/')."/","",$include);
+//      drupal_add_js($include);
+      drupal_set_html_head("<script type=\"text/javascript\" src=\"$include\"></script>");
     }
   }
 }