diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-01-02 14:35:00 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-01-02 14:35:00 +0000 |
| commit | 29b7a372ec3065d79f50d76207a3f0094a8da4a4 (patch) | |
| tree | f3923d5aa2b5f433fe2ee220870383b26b326c8a | |
| parent | 6e835462f7d6c041bf7e29d1bf4f723246236f7c (diff) | |
| download | webtrees-29b7a372ec3065d79f50d76207a3f0094a8da4a4.tar.gz webtrees-29b7a372ec3065d79f50d76207a3f0094a8da4a4.tar.bz2 webtrees-29b7a372ec3065d79f50d76207a3f0094a8da4a4.zip | |
Log viewer - correct sorting of events that occured in the same second.
| -rw-r--r-- | admin_site_logs.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/admin_site_logs.php b/admin_site_logs.php index bc1e5ae694..ea879107a7 100644 --- a/admin_site_logs.php +++ b/admin_site_logs.php @@ -140,10 +140,18 @@ case 'load_json': // MySQL numbers columns 1, 2, 3, ... switch (safe_GET('sSortDir_'.$i)) { case 'asc': - $ORDER_BY.=(1+(int)safe_GET('iSortCol_'.$i)).' ASC '; + if ((int)safe_GET('iSortCol_'.$i)==0) { + $ORDER_BY.='log_id ASC '; // column 0 is "timestamp", using log_id gives the correct order for events in the same second + } else { + $ORDER_BY.=(1+(int)safe_GET('iSortCol_'.$i)).' ASC '; + } break; case 'desc': - $ORDER_BY.=(1+(int)safe_GET('iSortCol_'.$i)).' DESC '; + if ((int)safe_GET('iSortCol_'.$i)==0) { + $ORDER_BY.='log_id DESC '; + } else { + $ORDER_BY.=(1+(int)safe_GET('iSortCol_'.$i)).' DESC '; + } break; } if ($i<$iSortingCols-1) { @@ -226,7 +234,7 @@ echo WT_I18N::translate('User'), '<br /><input name="user" size="12" value="', htmlspecialchars($user), '" /> ', '</td>', '<td>', - WT_I18N::translate('Gedcom'), '<br /><input name="gedc" size="12" value="', htmlspecialchars($gedc), '" ', WT_USER_IS_ADMIN ? '' : 'disabled', '/> ', + WT_I18N::translate('Family tree'), '<br /><input name="gedc" size="12" value="', htmlspecialchars($gedc), '" ', WT_USER_IS_ADMIN ? '' : 'disabled', '/> ', '</td>', '<td class="button" rowspan="2">', '<input type="submit" value="', WT_I18N::translate('Filter'), '" />', @@ -250,7 +258,7 @@ if ($action) { '<th>', WT_I18N::translate('Message'), '</th>', '<th>', WT_I18N::translate('IP address'), '</th>', '<th>', WT_I18N::translate('User'), '</th>', - '<th>', WT_I18N::translate('GEDCOM'), '</th>', + '<th>', WT_I18N::translate('Family tree'), '</th>', '</tr>', '</thead>', '<tbody>', |