http://atutor.ca/atutor/mantis/view.php?id=4604

diff --git a/docs/admin/config_edit.php b/docs/admin/config_edit.php
index c8323f7..b509ee3 100644 (file)
--- a/docs/admin/config_edit.php
+++ b/docs/admin/config_edit.php
@@ -186,10 +186,10 @@ if (!isset($_POST['submit'])) {
                echo '<select name="time_zone">';       
                        echo '<option value="0">'._AT('none').'</option>';
                foreach ($utc_timezones as $zone => $offset){
-                       if(($offset[1]-$local_offset) == $_config['time_zone']){
-                       echo '<option value="'.($offset[1]-$local_offset).'" selected="selected">'.$offset[0].'</option>';
+                       if(($offset[1]) == $_config['time_zone']){
+                       echo '<option value="'.($offset[1]).'" selected="selected">'.$offset[1].'</option>';
                        }else{
-                       echo '<option value="'.($offset[1]-$local_offset).'">'.$offset[0].'</option>';
+                       echo '<option value="'.($offset[1]).'">'.$offset[1].'</option>';
 
                        }
                }

diff --git a/docs/include/lib/output.inc.php b/docs/include/lib/output.inc.php
index 62b9837..dbce985 100644 (file)
--- a/docs/include/lib/output.inc.php
+++ b/docs/include/lib/output.inc.php
@@ -1412,10 +1412,11 @@ function provide_alternatives($cid, $content, $info_only = false, $only_on_secon
 */
 function apply_timezone($timestamp){
        global $_config;
-
+/*
        if($_config['time_zone']){
                $timestamp = ($timestamp + ($_config['time_zone']*3600));
        }
+*/
 
        if(isset($_SESSION['prefs']['PREF_TIMEZONE'])){
                $timestamp = ($timestamp + ($_SESSION['prefs']['PREF_TIMEZONE']*3600));

diff --git a/docs/users/atutor_settings.inc.php b/docs/users/atutor_settings.inc.php
index 975ad1c..adc0d8a 100644 (file)
--- a/docs/users/atutor_settings.inc.php
+++ b/docs/users/atutor_settings.inc.php
@@ -59,10 +59,10 @@ function print_theme_selectbox($theme_list, $selected_theme, $type) {
                echo '<select name="time_zone">';       
                        echo '<option value="0">'._AT('none').'</option>';
                foreach ($utc_timezones as $zone => $offset){
-                       if(($offset[1]-$local_offset) == $_SESSION['prefs']['PREF_TIMEZONE']){
-                       echo '<option value="'.($offset[1]-$local_offset).'" selected="selected">'.$offset[0].'</option>';
+                       if(($offset[1]) == $_SESSION['prefs']['PREF_TIMEZONE']){
+                       echo '<option value="'.($offset[1]).'" selected="selected">'.$offset[0].'</option>';
                        }else{
-                       echo '<option value="'.($offset[1]-$local_offset).'">'.$offset[0].'</option>';
+                       echo '<option value="'.($offset[1]).'">'.$offset[0].'</option>';
 
                        }
                }