From 0297666a7a0e961d3d8eeea56b3f067e35e4cdd9 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 14 Jan 2013 12:55:01 -0500
Subject: [PATCH] - nginx_merge_locations function now supports locations that are in one line (like "location /webftp/conf/ { deny all; }").
---
server/plugins-available/mysql_clientdb_plugin.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index e4825c8..ce6bb5a 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -393,7 +393,7 @@
}
if($data['new']['database_password'] != $data['old']['database_password'] && $data['new']['database_password'] != '') {
- $link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = PASSWORD('".$link->escape_string($data['new']['database_password'])."');"); // is contained in clear text so PASSWORD() func is needed
+ $link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = '".$link->escape_string($data['new']['database_password'])."';");
$app->log('Changing MySQL user password for: '.$data['new']['database_user'].'@'.$db_host,LOGLEVEL_DEBUG);
}
}
--
Gitblit v1.9.1