Changeset 879

Timestamp:

05/20/09 15:54:38 (15 years ago)

Author:

amuller

Message:

Ticket #485 - Arruma problemas antigos de nomenclatura no BD entre ExpressoMail1_2 e expressoMail

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (1 diff)
• expressoMail1_2/js/common_functions.js (modified) (1 diff)
• preferences/preferences.php (modified) (1 diff)

trunk/expressoMail1_2/index.php

@@ -83 +83 @@
         }
         $preferences = $GLOBALS['phpgw']->preferences->read();
-        $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] = $preferences['expressoMail1_2'];
-        $_SESSION['debug'] = $_SESSION['phpgw_info']['user']['preferences']['expressoMail'];
+        $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] = $preferences['expressoMail'];
 
         $template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);

trunk/expressoMail1_2/js/common_functions.js

@@ -559 +559 @@
 function preferences_mail(){
         if(preferences.type_signature && preferences.type_signature == 'html') {
-                location.href="../preferences/preferences.php?appname=expressoMail1_2";
+                location.href="../preferences/preferences.php?appname=expressoMail";
         }
         else {

trunk/preferences/preferences.php

@@ -53 +53 @@
                 else
                 {
-                        return $_GET['appname'];
+                        return ($_GET['appname'] == 'expressoMail1_2'?'expressoMail':$_GET['appname']);             
                 }
         }