From c7e4ebd85dcf3e30ebcc23d9e5aa6903e888858f Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Wed, 3 Nov 2010 16:36:50 +0000
Subject: [PATCH] Updated with new bandwidth based stream config

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3167 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/includes/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 35d9ace76..3552846b0 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -875,7 +875,7 @@ function canStreamIframe()
 
 function canStreamNative()
 {
-   return( ZM_CAN_STREAM == "yes" || ( ZM_CAN_STREAM == "auto" && (isNetscape() || isKonqueror()) ) );
+   return( ZM_WEB_CAN_STREAM == "yes" || ( ZM_WEB_CAN_STREAM == "auto" && (isNetscape() || isKonqueror()) ) );
 }
 
 function canStreamApplet()
@@ -2205,7 +2205,7 @@ function jsonEncode( &$value )
                 {
                     if ( $result != '{' )
                         $result .= ',';
-                    $result .= jsonEncode( $subkey ).':'.jsonEncode( $subvalue );
+                    $result .= '"'.jsonEncode( $subkey ).'":'.jsonEncode( $subvalue );
                 }
                 return( $result.'}' );
             }