From 67f2ddc404907835ba16990f1e077514464806a4 Mon Sep 17 00:00:00 2001
From: bhaal2 <bhaal@darkrealm.net>
Date: Thu, 15 Sep 2016 01:55:58 +1000
Subject: [PATCH] Changed filter list order back to Name Added extra argument
 'Id' to delete button onClick call

---
 web/skins/classic/views/filter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 8723bcc99..4d818a408 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -24,7 +24,7 @@ if ( !canView( 'Events' ) ) {
 }
 $selectName = "filterId";
 $filterNames = array( ''=>translate('ChooseFilter') );
-foreach ( dbFetchAll( "select * from Filters order by Id" ) as $row ) {
+foreach ( dbFetchAll( "select * from Filters order by Name" ) as $row ) {
   $filterNames[$row['Id']] = $row['Name'];
   if ( $row['Background'] )
     $filterNames[$row['Id']] .= "*";
@@ -328,7 +328,7 @@ if ( ZM_OPT_MESSAGE ) {
           <input type="button" value="<?php echo translate('Save') ?>" onclick="saveFilter( this );"/>
 <?php } ?>
 <?php if ( canEdit( 'Events' ) && isset($dbFilter) && $dbFilter['Name'] ) { ?>
-          <input type="button" value="<?php echo translate('Delete') ?>" onclick="deleteFilter( this, '<?php echo $dbFilter['Name'] ?>' );"/>
+          <input type="button" value="<?php echo translate('Delete') ?>" onclick="deleteFilter( this, <?php echo $dbFilter['Id'] ?>, '<?php echo $dbFilter['Name'] ?>' );"/>
 <?php } ?>
           <input type="button" value="<?php echo translate('Reset') ?>" onclick="submitToFilter( this, 1 );"/>
         </div>