[Vtigercrm-commits] [vtiger-commits] r9814 - in /vtigercrm/branches/4.2/modules/squirrelmail-1.4.4: redirect.php webmail.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: allanbush
Date: Fri Nov 10 18:37:13 2006
New Revision: 9814

Log:
Fixed php 5 issue with global variable $theme being reused in squirrelmail.  Refs #1287.

Modified:
    vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/redirect.php
    vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/webmail.php

Modified: vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/redirect.php
==============================================================================
--- vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/redirect.php (original)
+++ vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/redirect.php Fri Nov 10 18:37:13 2006
@@ -17,6 +17,11 @@
  * Path for SquirrelMail required files.
  * @ignore
  */
+
+// store this value as squirrelmail uses this variable in the global scope as well
+$vtiger_theme = $theme;
+unset($theme);
+
 define('SM_PATH','modules/squirrelmail-1.4.4/');
 //define('SM_PATH','../');
 
@@ -165,6 +170,7 @@
 }
 */
 
+$theme = $vtiger_theme;
 /* Write session data and send them off to the appropriate page. */
 //session_write_close();
 @header("Location: $redirect_url");

Modified: vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/webmail.php
==============================================================================
--- vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/webmail.php (original)
+++ vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/webmail.php Fri Nov 10 18:37:13 2006
@@ -26,6 +26,8 @@
  require_once ($theme_path."layout_utils.php");
 */
 
+$vtiger_theme = $theme;
+unset($theme);
 
 define('SM_PATH','modules/squirrelmail-1.4.4/');
 
@@ -172,6 +174,7 @@
 }
 
 */
+$theme = $vtiger_theme;
 $smodule = $_REQUEST['smodule'];
 header("Location: index.php?module=squirrelmail-1.4.4&action=right_main&smodule=$smodule");