From 7d633737f5c73bc4087062b84ef3d8396f5ae1aa Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Sun, 22 May 2005 15:39:14 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1424 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/zm_actions.php  | 4 ++++
 web/zm_config.php.z | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/zm_actions.php b/web/zm_actions.php
index c788cf5c6..9ef8e3824 100644
--- a/web/zm_actions.php
+++ b/web/zm_actions.php
@@ -843,6 +843,10 @@ if ( isset($action) )
 					$control = 'preset_goto';
 					$ctrl_command .= " --preset ".$matches[1];
 				}
+				elseif ( $control == "preset_set" )
+				{
+					$ctrl_command .= " --preset ".$preset;
+				}
 				elseif ( $control == "move_map" )
 				{
 					$ctrl_command .= " -xcoord $x -ycoord $y";
diff --git a/web/zm_config.php.z b/web/zm_config.php.z
index 775ffd354..35f4830ca 100644
--- a/web/zm_config.php.z
+++ b/web/zm_config.php.z
@@ -130,7 +130,7 @@ function loadConfig()
 	$config = array();
 	$config_cat = array();
 
-	$sql = "select * from Config";
+	$sql = "select * from Config order by Id asc";
 	$result = mysql_query( $sql );
 	if ( !$result )
 		echo mysql_error();