Changeset 955

Show
Ignore:
Timestamp:
08/19/08 14:41:37 (3 years ago)
Author:
areski
Message:

fix selection on language

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/common/lib/admin.defines.php

    r835 r955  
    133133/* 
    134134 *              GLOBAL POST/GET VARIABLE 
    135  */              
    136 getpost_ifset(array('form_action', 'atmenu', 'action', 'stitle', 'sub_action', 'IDmanager', 'current_page', 'order', 'sens', 'mydisplaylimit', 'filterprefix', 'cssname', 'popup_select')); 
     135 */ 
     136getpost_ifset(array('form_action', 'atmenu', 'action', 'stitle', 'sub_action', 'IDmanager', 'current_page', 'order', 'sens', 'mydisplaylimit', 'filterprefix', 'cssname', 'popup_select', 'language')); 
    137137 
    138138if (!isset($_SESSION)) { 
    139139        session_start(); 
    140140} 
    141   
    142  // Language session 
    143 if (!isset($_SESSION["language"])) { 
     141 
     142// Language Selection 
     143if (isset($language)) { 
     144        $_SESSION["language"] = $language; 
     145} elseif (!isset($_SESSION["language"])) { 
    144146        $_SESSION["language"]='english'; 
    145 } else if (isset($language)) { 
    146         $_SESSION["language"] = $language; 
    147147} 
    148148 

  • trunk/common/lib/customer.defines.php

    r835 r955  
    132132 *              GLOBAL POST/GET VARIABLE 
    133133 */ 
    134 getpost_ifset(array('form_action', 'atmenu', 'action', 'stitle', 'sub_action', 'IDmanager', 'current_page', 'order', 'sens', 'mydisplaylimit', 'filterprefix','language', 'cssname', 'exporttype')); 
     134getpost_ifset(array('form_action', 'atmenu', 'action', 'stitle', 'sub_action', 'IDmanager', 'current_page', 'order', 'sens', 'mydisplaylimit', 'filterprefix', 'language', 'cssname', 'exporttype')); 
    135135 
    136136 
    …… 
    139139} 
    140140 
    141 // Language session 
    142 if (!isset($_SESSION["language"])) { 
     141// Language Selection 
     142if (isset($language)) { 
     143        $_SESSION["language"] = $language; 
     144} elseif (!isset($_SESSION["language"])) { 
    143145        $_SESSION["language"]='english'; 
    144 } else if (isset($language)) { 
    145         $_SESSION["language"] = $language; 
    146146} 
    147147