Index: securesite.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/securesite/Attic/securesite.inc,v
retrieving revision 1.10.2.7
diff -u -F^f -r1.10.2.7 securesite.inc
--- securesite.inc	6 Feb 2008 17:50:29 -0000	1.10.2.7
+++ securesite.inc	6 Feb 2008 17:57:57 -0000
@@ -5,7 +5,7 @@
  * Returns complete form for login
  */
 function _securesite_login_form() {
-  return '<h1>'. t('Login') .'</h1><div id="login">'. variable_get('securesite_login_form', t('<p>Enter your %site username and password.</p>', array('%site' => variable_get('site_name', 'Drupal')))) . theme('status_messages') .'</div>
+  return '<h1>'. t('Login') .'</h1><div id="login">'. variable_get('securesite_login_form', t('<p>Enter your %site username and password.</p>', array('%site' => variable_get('site_name', 'Drupal')))) . securesite_status_messages() .'</div>
 <form action="'. request_uri() .'" method="post">
 <p><label for="edit-name">'. t('Username') .': <input type="text" maxlength="55" class="form-text" name="edit[name]" id="edit-name" value=""></label></p>
 <p><label for="edit-pass">'. t('Password') .': <input type="password" class="form-password" maxlength="24" name="edit[pass]" id="edit-pass" value=""></label></p>
@@ -18,7 +18,7 @@ function _securesite_login_form() {
  */
 function _securesite_request_form() {
   if ($form_msg = variable_get('securesite_request_form', t('<p>Enter your username <em>and</em> your e-mail address.</p>'))) {
-    return '<h1>'. t('Password Reset') .'</h1><div id="reset">'. $form_msg .'</div>'. theme('status_messages') .'
+    return '<h1>'. t('Password Reset') .'</h1><div id="reset">'. $form_msg .'</div>'. securesite_status_messages() .'
 <form action="'. request_uri() .'" method="post">
 <p><label for="edit-name">'. t('Username') .': <input type="text" maxlength="55" class="form-text" name="edit[name]" id="edit-name" value=""></label></p>
 <p><label for="edit-mail">'. t('E-mail address') .': <input type="text" maxlength="64" class="form-text" name="edit[mail]" id="edit-mail" value=""></label></p>
@@ -43,3 +43,26 @@ function _securesite_dialog_page($conten
     include_once(drupal_get_path('module', 'securesite') . $dialog_file);
   }
 }
+
+/**
+ * Copy of theme_status_messages() needed to prevent PHP errors when using caching
+ * See http://drupal.org/node/217466
+ */
+function securesite_status_messages($display = NULL) {
+  $output = '';
+  foreach (drupal_get_messages($display) as $type => $messages) {
+    $output .= "<div class=\"messages $type\">\n";
+    if (count($messages) > 1) {
+      $output .= " <ul>\n";
+      foreach ($messages as $message) {
+        $output .= '  <li>'. $message ."</li>\n";
+      }
+      $output .= " </ul>\n";
+    }
+    else {
+      $output .= $messages[0];
+    }
+    $output .= "</div>\n";
+  }
+  return $output;
+}
Index: securesite.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/securesite/Attic/securesite.module,v
retrieving revision 1.24.2.25
diff -u -F^f -r1.24.2.25 securesite.module
--- securesite.module	6 Feb 2008 17:57:42 -0000	1.24.2.25
+++ securesite.module	6 Feb 2008 17:57:57 -0000
@@ -143,6 +143,7 @@ function securesite_admin_settings() {
  * Implements the securesite authentication
  */
 function securesite_init() {
+  require_once './includes/common.inc'; // Work-around for http://drupal.org/node/217466
   global $user, $base_path;
 
   $guest_name         = variable_get('securesite_guest_name', '');