Changeset 554 for trunk/includes/global.php

Timestamp:

Jul 29, 2013, 9:25:33 PM (11 years ago)

Author:

chronos

Message:

• Fixed: Error in user profile page if user id is not given.
• Fixed: Error in translation list view if translation group item filter is empty.
• Fixed: SQL constraint error in case of export deletion which have records in related tables.
• Fixed: Error when table ordering parameter contain invalid value.

File:

• trunk/includes/global.php (modified) (2 diffs)

trunk/includes/global.php

@@ -232 +232 @@
   
   if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
-  if(array_key_exists('OrderDir', $_GET)) $_SESSION['OrderDir'] = $_GET['OrderDir'];
+  if(array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage))) 
+        $_SESSION['OrderDir'] = $_GET['OrderDir'];
   if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
-  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
+  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;  
   
   // Check OrderCol
@@ -260 +261 @@
     $QueryItems['OrderCol'] = $Column['Name'];
     $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img  style="vertical-align: middle; border: 0px;" src="'.$System->Link('/images/'.$OrderArrowImage[$_SESSION['OrderDir']]).'" alt="order arrow">';
+    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img  style="vertical-align: middle; border: 0px;" src="'.
+      $System->Link('/images/'.$OrderArrowImage[$_SESSION['OrderDir']]).'" alt="order arrow">';
       else $ArrowImage = '';
     if($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';