ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated with new bandwidth based stream config 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3167 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2010-11-03 16:36:50 +00:00
parent 7e1979760e
commit c7e4ebd85d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/includes/functions.php
View File

@ -875,7 +875,7 @@ function canStreamIframe()
function canStreamNative() 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() function canStreamApplet()
@ -2205,7 +2205,7 @@ function jsonEncode( &$value )
{ {
if ( $result != '{' ) if ( $result != '{' )
$result .= ','; $result .= ',';
$result .= jsonEncode( $subkey ).':'.jsonEncode( $subvalue ); $result .= '"'.jsonEncode( $subkey ).'":'.jsonEncode( $subvalue );
} }
return( $result.'}' ); return( $result.'}' );
} }