diff --git a/ChangeLog b/ChangeLog index 6c55e96bb..44767925d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10,8 +10,9 @@ $Source$ bit both the '$set$' switch cases. * ldi_check.php3: fixed bug #448522 (Insert Data Error on Win32-Server). * tbl_change.php3, lines 165 & 287: removed erroneous . - * lib.inc.php3, line 947: fix a bug when primary key values contain - slashes. + * lib.inc.php3: + - line 947: fix a bug when primary key values contain slashes. + - merged patch #443393. 2001-08-08 Steve Alberty * tbl_replace.php3: remove warning in a new row if a 'set' field is not diff --git a/images/asc_order.gif b/images/asc_order.gif new file mode 100644 index 000000000..956bce53e Binary files /dev/null and b/images/asc_order.gif differ diff --git a/images/desc_order.gif b/images/desc_order.gif new file mode 100644 index 000000000..e2ecca496 Binary files /dev/null and b/images/desc_order.gif differ diff --git a/lib.inc.php3 b/lib.inc.php3 index 691e0eff8..12fa00b63 100755 --- a/lib.inc.php3 +++ b/lib.inc.php3 @@ -871,12 +871,15 @@ var errorMsg2 = 'name) . ' ' . $GLOBALS['cfgOrder']; + $order_img = ''; } else if (substr($sql_order, -3) == 'ASC' && $is_in_sort) { $sort_order = ' ORDER BY ' . backquote($field->name) . ' DESC'; + $order_img = ' ASC'; } else if (substr($sql_order, -4) == 'DESC' && $is_in_sort) { $sort_order = ' ORDER BY ' . backquote($field->name) . ' ASC'; + $order_img = ' DESC'; } if (eregi('(.*)( LIMIT (.*)| PROCEDURE (.*)| FOR UPDATE| LOCK IN SHARE MODE)', $unsorted_sql_query, $regs3)) { $sorted_sql_query = $regs3[1] . $sort_order . $regs3[2]; @@ -892,7 +895,7 @@ var errorMsg2 = ' - name); ?> + name); ?>