Changeset 14730 for extensions/UserAdvManager/branches/2.40/ConfirmMail.php

Timestamp:

05/03/12 21:55:00 (13 months ago)

Author:

Eric

Message:

r14729 merged from trunk to branch 2.40 :
Bug 2620 fixed - Display of ConfirmMail, rejected and del_account pages have been improved
Bug 2621 fixed - Display of ConfirmMail, rejected and del_account pages have been improved for IE8 and IE9 render
Bug 2631 fixed - Piwigo 2.4 compliance : $confgallery_url replaced by get_gallery_home_url() for [myurl] tag
Bug 2623 fixed - Ability to customize email subjects (confirmation, information and ghostTracker email)
Bug 2628 fixed - Php notice when email is not mandatory for registration

Files:

• extensions/UserAdvManager/branches/2.40/ConfirmMail.php (modified) (4 diffs)

extensions/UserAdvManager/branches/2.40/ConfirmMail.php

@@ -77 +77 @@
       $replacements[] = $conf['gallery_title'];
       $patterns[] = '#\[myurl\]#i';
-      $replacements[] = $conf['gallery_url'];
-   
+      $replacements[] = get_gallery_home_url();
+
       if (function_exists('get_user_language_desc'))
       {
@@ -87 +87 @@
     
     $redirect = true;
-    $Path_UAM = UAM_PATH; // Path to be used in template to reach the icons
-    
-    $template->assign(
-                        array(
-        'UAM_PATH'             => $Path_UAM,
-        'REDIRECT'             => $redirect,
-        'STATUS'               => $status,
-                                'CONFIRM_MAIL_MESSAGE' => $custom_text,
-                        )
-                );
   }  
   else
@@ -112 +102 @@
       $replacements[] = $conf['gallery_title'];
       $patterns[] = '#\[myurl\]#i';
-      $replacements[] = $conf['gallery_url'];
+      $replacements[] = get_gallery_home_url();
    
       if (function_exists('get_user_language_desc'))
@@ -120 +110 @@
       else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM_ConfirmMail[6]));
     }
-    
-    $template->assign(
-                        array(
-        'REDIRECT'             => $redirect,
-        'GALLERY_URL'          => make_index_url(),
-        'STATUS'               => $status,
-                                'CONFIRM_MAIL_MESSAGE' => $custom_text,
-                        )
-                );
   }
+
+  $Path_UAM = UAM_PATH; // Path to be used in template to reach the icons
+
+  $template->assign(
+    array(
+      'UAM_PATH'             => $Path_UAM,
+      'REDIRECT'             => $redirect,
+      'STATUS'               => $status,
+                  'CONFIRM_MAIL_MESSAGE' => $custom_text,
+    )
+  );
 }