Merge branch 'master' of github.com:ZoneMinder/zoneminder
This commit is contained in:
commit
ade0d750c8
|
@ -401,6 +401,7 @@ if ( $version ) {
|
|||
$command .= ' --add-drop-table --databases '.$Config{ZM_DB_NAME}.' > '.$backup;
|
||||
print("Creating backup to $backup. This may take several minutes.\n");
|
||||
print("Executing '$command'\n") if logDebugging();
|
||||
($command) = $command =~ /(.*)/; # detaint
|
||||
my $output = qx($command);
|
||||
my $status = $? >> 8;
|
||||
if ( $status || logDebugging() ) {
|
||||
|
@ -995,6 +996,7 @@ sub patchDB {
|
|||
$command .= '/zm_update-'.$version.'.sql';
|
||||
|
||||
print("Executing '$command'\n") if logDebugging();
|
||||
($command) = $command =~ /(.*)/; # detaint
|
||||
my $output = qx($command);
|
||||
my $status = $? >> 8;
|
||||
if ( $status || logDebugging() ) {
|
||||
|
|
|
@ -848,7 +848,7 @@ function initPage() {
|
|||
if ( refreshApplet && appletRefreshTime ) {
|
||||
appletRefresh.delay(appletRefreshTime*1000);
|
||||
}
|
||||
if ( scale == 'auto' ) changeScale();
|
||||
if ( scale == '0' || scale == 'auto' ) changeScale();
|
||||
if ( window.history.length == 1 ) {
|
||||
$j('#closeControl').html('');
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue