From 8202cc96e7d5257ec0912ae375c5ed9be687d48a Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 9 Dec 2010 11:49:07 +0000 Subject: [PATCH] - fixed double-declaration of variable causing nginx-cron to fail on mysql_fetch_array() for htpasswd-entries, fixes #516 --- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 566a318c..44ed87d9 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -524,7 +524,7 @@ class nginx $query = "SELECT * FROM " . TABLE_PANEL_HTPASSWDS . " WHERE `customerid`='" . $domain['customerid'] . "'"; $result = $this->db->query($query); - $result = array(); + $returnval = array(); $x = 0; while($row_htpasswds = $this->db->fetch_array($result)) { @@ -544,13 +544,13 @@ class nginx $path = makeCorrectDir(substr($row['path'], strlen($domain['documentroot']) - 1)); - $result[$x]['path'] = $path; - $result[$x]['root'] = makeCorrectDir($domain['documentroot']); - $result[$x]['usrf'] = $htpasswd_filename; + $returnval[$x]['path'] = $path; + $returnval[$x]['root'] = makeCorrectDir($domain['documentroot']); + $returnval[$x]['usrf'] = $htpasswd_filename; $x++; } } - return $result; + return $returnval; } protected function composePhpOptions($domain)