Changeset 2089 for trunk/admin/notification_by_mail.php

Timestamp:

Sep 12, 2007, 6:01:54 AM (17 years ago)

Author:

rvelices

Message:

merge -r2088 from branch-1_7 to trunk

• urls used in http redirections must not be html escaped (eg. should use & instead of &)

File:

• trunk/admin/notification_by_mail.php (modified) (10 diffs)

trunk/admin/notification_by_mail.php

@@ -85 +85 @@
       $must_repost = true;
       array_push($page['errors'],
-        l10n_dec('nbm_background_treatment_redirect_second', 
+        l10n_dec('nbm_background_treatment_redirect_second',
                  'nbm_background_treatment_redirect_seconds',
                   $time_refresh));
@@ -165 +165 @@
       array_push
       (
-        $inserts, 
+        $inserts,
         array
         (
@@ -176 +176 @@
       array_push
       (
-        $page['infos'], 
+        $page['infos'],
         sprintf(
-          l10n('nbm_user_x_added'), 
-          $nbm_user['username'], 
+          l10n('nbm_user_x_added'),
+          $nbm_user['username'],
           get_email_address_as_display_text($nbm_user['mail_address'])
         )
@@ -204 +204 @@
         $result = pwg_query($query);
 
-        redirect($base_url.get_query_string_diff(array()), l10n('nbm_redirect_msg'));
+        redirect($base_url.get_query_string_diff(array(), false), l10n('nbm_redirect_msg'));
       }
     }
@@ -219 +219 @@
   global $conf, $page, $user, $lang_info, $lang, $env_nbm;
   $return_list = array();
-  
+
   if (in_array($action, array('list_to_send', 'send')))
   {
@@ -314 +314 @@
                   array
                   (
-                    'DATE_BETWEEN_1' => $nbm_user['last_send'], 
+                    'DATE_BETWEEN_1' => $nbm_user['last_send'],
                     'DATE_BETWEEN_2' => $dbnow,
                     'END_PUNCT' => $end_punct
@@ -422 +422 @@
             }
           }
-          
+
           // unset env nbm user
           unset_user_on_env_nbm();
@@ -520 +520 @@
         }
       }
-    
+
       array_push($page['infos'],
         l10n_dec('nbm_updated_param_count', 'nbm_updated_params_count',
@@ -587 +587 @@
      (
       'caption' => l10n('nbm_param_mode'),
-      'url' => add_url_params($base_url.get_query_string_diff(array('mode', 'select')), 
+      'url' => add_url_params($base_url.get_query_string_diff(array('mode', 'select')),
         array('mode' => 'param'))
      ),
@@ -627 +627 @@
   $template->assign_block_vars
   (
-    'repost', 
+    'repost',
       array
       (