Index: sites/all/modules/popups/popups.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/popups/popups.module,v
retrieving revision 1.11.2.16
diff -u -r1.11.2.16 popups.module
--- sites/all/modules/popups/popups.module	17 Nov 2008 23:51:49 -0000	1.11.2.16
+++ sites/all/modules/popups/popups.module	18 Nov 2008 21:43:06 -0000
@@ -68,11 +68,10 @@
  */
 function popups_init() {  
   $popups = popups_get_popups();
-  if (isset($popups[$_GET['q']]) || variable_get('popups_always_scan', 0)) {
-    popups_add_popups($popups[$_GET['q']]);
-  }
-  if (isset($popups['*'])) {
-    popups_add_popups($popups['*']);
+  foreach ($popups as $path => $popup_config) {
+    if (drupal_match_path($_GET['q'], $path)) {
+      popups_add_popups($popups[$path]);
+    }
   }
   
   
@@ -312,11 +311,6 @@
   drupal_set_title("Popups Settings");
   $form = array();
 
-  $form['popups_always_scan'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Scan all pages for popup links.'),
-    '#default_value' => variable_get('popups_always_scan', 0),
-  );
   $form['popups_popup_final_message'] = array(
     '#type' => 'checkbox',
     '#title' => t('Do NOT auto-close final message.'),