# HG changeset patch
# User Dan
# Date 1213507800 14400
# Node ID 43e7254afdb441efe9114512f59c10b281ef3ad4
# Parent  c196e8f336b92c150c2e39831136024e37d98561
Renamed some functions (that were new in this release anyway) due to compatibility broken with PunBB bridge

diff -r c196e8f336b9 -r 43e7254afdb4 includes/functions.php
--- a/includes/functions.php	Sun Jun 15 01:29:30 2008 -0400
+++ b/includes/functions.php	Sun Jun 15 01:30:00 2008 -0400
@@ -395,7 +395,7 @@
  * Generates a confirmation form if a CSRF check fails. Will terminate execution.
  */
 
-function csrf_confirm_form()
+function csrf_request_confirm()
 {
   global $db, $session, $paths, $template, $plugins; // Common objects
   global $lang;
@@ -4425,7 +4425,7 @@
  * Caches the computed user rank information.
  */
 
-function generate_ranks_cache()
+function generate_cache_userranks()
 {
   global $db, $session, $paths, $template, $plugins; // Common objects
   global $lang;
diff -r c196e8f336b9 -r 43e7254afdb4 includes/sessions.php
--- a/includes/sessions.php	Sun Jun 15 01:29:30 2008 -0400
+++ b/includes/sessions.php	Sun Jun 15 01:30:00 2008 -0400
@@ -4267,6 +4267,6 @@
  * Cron task - regenerate cached user rank information
  */
 
-register_cron_task('generate_ranks_cache', 0.25);
+register_cron_task('generate_cache_userranks', 0.25);
 
 ?>
diff -r c196e8f336b9 -r 43e7254afdb4 includes/template.php
--- a/includes/template.php	Sun Jun 15 01:29:30 2008 -0400
+++ b/includes/template.php	Sun Jun 15 01:30:00 2008 -0400
@@ -1147,6 +1147,11 @@
       header('Content-type: application/xhtml+xml');
     }
     
+    // Reassign one important variable that can need to be changed after init_vars(): ADDITIONAL_HEADERS
+    $this->assign_vars(array(
+        'ADDITIONAL_HEADERS' => $this->additional_headers
+      ));
+    
     $headers_sent = true;
     if(!defined('ENANO_HEADERS_SENT'))
       define('ENANO_HEADERS_SENT', '');
diff -r c196e8f336b9 -r 43e7254afdb4 plugins/SpecialAdmin.php
--- a/plugins/SpecialAdmin.php	Sun Jun 15 01:29:30 2008 -0400
+++ b/plugins/SpecialAdmin.php	Sun Jun 15 01:30:00 2008 -0400
@@ -1989,7 +1989,7 @@
                   div.style.width = width + 'px';
                   div.style.height = height + 'px';
                   var body = document.getElementsByTagName('body')[0];
-                  miniPromptDestroy(true);
+                  miniPromptDestroy(this);
                   body.appendChild(div);
                   ajaxPageBin(namespace_list.Admin + 'AdminLogout');
                 }
diff -r c196e8f336b9 -r 43e7254afdb4 plugins/SpecialGroups.php
--- a/plugins/SpecialGroups.php	Sun Jun 15 01:29:30 2008 -0400
+++ b/plugins/SpecialGroups.php	Sun Jun 15 01:30:00 2008 -0400
@@ -224,7 +224,7 @@
           $db->free_result();
           
           // just added a user to the group, so regenerate the ranks cache
-          generate_ranks_cache();
+          generate_cache_userranks();
           
           break;
         case 'del_users':
@@ -239,7 +239,7 @@
             }
           }
           // regenerate the ranks cache
-          generate_ranks_cache();
+          generate_cache_userranks();
           
           break;
         case 'pending':
@@ -266,7 +266,7 @@
             }
           }
           // memberships updated/changed, regenerate ranks cache
-          generate_ranks_cache();
+          generate_cache_userranks();
           
           echo '<div class="info-box">' . $lang->get('groupcp_msg_pending_updated') . '</div>';
           break;
diff -r c196e8f336b9 -r 43e7254afdb4 plugins/SpecialUserFuncs.php
--- a/plugins/SpecialUserFuncs.php	Sun Jun 15 01:29:30 2008 -0400
+++ b/plugins/SpecialUserFuncs.php	Sun Jun 15 01:30:00 2008 -0400
@@ -612,7 +612,7 @@
   $token = $paths->getParam(0);
   if ( $token !== $session->csrf_token )
   {
-    csrf_confirm_form();
+    csrf_request_confirm();
   }
   
   $l = $session->logout();
diff -r c196e8f336b9 -r 43e7254afdb4 plugins/SpecialUserPrefs.php
--- a/plugins/SpecialUserPrefs.php	Sun Jun 15 01:29:30 2008 -0400
+++ b/plugins/SpecialUserPrefs.php	Sun Jun 15 01:30:00 2008 -0400
@@ -599,7 +599,7 @@
           $db->free_result();
         }
         
-        generate_ranks_cache();
+        generate_cache_userranks();
         
         echo '<div class="info-box" style="margin: 0 0 10px 0;">' . $lang->get('usercp_publicinfo_msg_save_success') . '</div>';
       }
diff -r c196e8f336b9 -r 43e7254afdb4 plugins/admin/GroupManager.php
--- a/plugins/admin/GroupManager.php	Sun Jun 15 01:29:30 2008 -0400
+++ b/plugins/admin/GroupManager.php	Sun Jun 15 01:30:00 2008 -0400
@@ -245,7 +245,7 @@
         else
           echo '<div class="warning-box">' . $lang->get('acpug_err_username_not_exist', array('username' => htmlspecialchars($_POST['edit_add_username']))) . '</div>';
       }
-      generate_ranks_cache();
+      generate_cache_userranks();
     }
     $sg_disabled = ( $row['system_group'] == 1 ) ?
              ' value="' . $lang->get('acpug_btn_cant_delete') . '" disabled="disabled" style="color: #FF9773" ' :
diff -r c196e8f336b9 -r 43e7254afdb4 plugins/admin/UserManager.php
--- a/plugins/admin/UserManager.php	Sun Jun 15 01:29:30 2008 -0400
+++ b/plugins/admin/UserManager.php	Sun Jun 15 01:30:00 2008 -0400
@@ -390,7 +390,7 @@
           }
           
           // user level updated, regenerate the ranks cache
-          generate_ranks_cache();
+          generate_cache_userranks();
           
           echo '<div class="info-box">' . $lang->get('acpum_msg_save_success') . '</div>';
         }