Fix go back on agenda view on correct page

Dolibarr · Sep 19, 2018 · 92aa692 · 92aa692
1 parent 12b449f
commit 92aa692
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
@@ -109,16 +109,15 @@
 {
 	$action = (($defaultview != 'show_list') ? $defaultview : 'show_month');
 }
-
-if (GETPOST('viewcal') && $action != 'show_day' && $action != 'show_week')  {
+if (GETPOST('viewcal','none') && GETPOST('action','alpha') != 'show_day' && GETPOST('action','alpha') != 'show_week')  {
     $action='show_month'; $day='';
-}                                                   // View by month
-if (GETPOST('viewweek') || $action == 'show_week') {
+} // View by month
+if (GETPOST('viewweek','none') || GETPOST('action','alpha') == 'show_week') {
     $action='show_week'; $week=($week?$week:date("W")); $day=($day?$day:date("d"));
-}  // View by week
-if (GETPOST('viewday') || $action == 'show_day')  {
+} // View by week
+if (GETPOST('viewday','none') || GETPOST('action','alpha') == 'show_day')  {
     $action='show_day'; $day=($day?$day:date("d"));
-}                                  // View by day
+} // View by day
 
 // Load translation files required by the page
 $langs->loadLangs(array('agenda', 'other', 'commercial'));