Index: popups.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/popups/popups.module,v
retrieving revision 1.10
diff -u -r1.10 popups.module
--- popups.module	6 Mar 2008 20:32:50 -0000	1.10
+++ popups.module	1 Apr 2008 20:40:26 -0000
@@ -187,38 +187,42 @@
  */
 function popups_add_popups($rules=null) { 
   static $added = FALSE;
+
+  $settings = array('popups' => array());
+
   if (!$added) {
     drupal_add_css(drupal_get_path('module', 'popups') .'/popups.css');
     drupal_add_js(drupal_get_path('module', 'popups') .'/popups.js');
     drupal_add_js('misc/jquery.form.js');
     if (is_array($rules)) {
-      $settings = array( 'popups' => array(
-        'defaultTargetSelector' => variable_get('popups_content_selector', 'div.left-corner > div.clear-block:last'),
-        'defaultTitleSelector' => variable_get('popups_title_selector', 'div.left-corner > h2:eq(0)'),
-        'links' => array(),  
-      ));
-      foreach ($rules as $popup_selector => $options) { 
-        if (is_array($options)) {
-          $settings['popups']['links'][$popup_selector] = $options;
-          if (isset($options['additionalJavascript']) && is_array($options['additionalJavascript'])) {
-            foreach ($options['additionalJavascript'] as $file) {
-              drupal_add_js($file);
-            }
-          }
-          if (isset($options['additionalCss']) && is_array($options['additionalCss'])) {
-            foreach ($options['additionalCss'] as $file) {
-              drupal_add_css($file);
-            }
+      $settings['popups']['defaultTargetSelector'] = variable_get('popups_content_selector', 'div.left-corner > div.clear-block:last');
+      $settings['popups']['defaultTitleSelector'] = variable_get('popups_title_selector', 'div.left-corner > h2:eq(0)');
+      drupal_add_js( $settings, 'setting' );
+    }
+    
+    $added = TRUE;
+  }
+  if (is_array($rules)) {
+    $settings['popups']['links'] = array();
+    foreach ($rules as $popup_selector => $options) { 
+      if (is_array($options)) {
+        $settings['popups']['links'][$popup_selector] = $options;
+        if (isset($options['additionalJavascript']) && is_array($options['additionalJavascript'])) {
+          foreach ($options['additionalJavascript'] as $file) {
+            drupal_add_js($file);
           }
         }
-        else {
-          $settings['popups']['links'][$options] = array();
+        if (isset($options['additionalCss']) && is_array($options['additionalCss'])) {
+          foreach ($options['additionalCss'] as $file) {
+            drupal_add_css($file);
+          }
         }
       }
-      drupal_add_js( $settings, 'setting' );
+      else {
+        $settings['popups']['links'][$options] = array();
+      }
     }
-    
-    $added = TRUE;
+    drupal_add_js( $settings, 'setting' );
   }
 }