From eb2d95f9ba2fbdaf19a379241ab59d6f92ac6439 Mon Sep 17 00:00:00 2001 From: Erik Fonnesbeck Date: Thu, 26 Apr 2012 19:47:57 -0600 Subject: Use !empty instead of isset to prevent accidental deletion of the last used repository URL when firmware update gitsync settings have been saved without a repository URL. --- tmp/post_upgrade_command.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tmp') diff --git a/tmp/post_upgrade_command.php b/tmp/post_upgrade_command.php index a188710..dc2a44e 100755 --- a/tmp/post_upgrade_command.php +++ b/tmp/post_upgrade_command.php @@ -7,9 +7,9 @@ require_once("functions.inc"); if(file_exists("/usr/local/bin/git") && isset($config['system']['gitsync']['synconupgrade'])) { - if(isset($config['system']['gitsync']['repositoryurl'])) + if(!empty($config['system']['gitsync']['repositoryurl'])) exec("cd /root/pfsense/pfSenseGITREPO/pfSenseGITREPO && git config remote.origin.url " . escapeshellarg($config['system']['gitsync']['repositoryurl'])); - if(isset($config['system']['gitsync']['branch'])) + if(!empty($config['system']['gitsync']['branch'])) system("pfSsh.php playback gitsync " . escapeshellarg($config['system']['gitsync']['branch']) . " --upgrading"); } @@ -25,4 +25,4 @@ if(file_exists($filename)) exec("/bin/rm -f $filename"); -?> \ No newline at end of file +?> -- cgit v1.1