From 4261437963913bd53f854275cbb2fc8b8ac941d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20M=C3=BCller?= <om@omnis.ch>
Date: Sat, 27 Oct 2001 06:55:11 +0000
Subject: [PATCH] Put the ENCRYPT function back to the config file. (hey, we're
 supposed to improve phpmyadmin, not to remove existing features! :)

---
 ChangeLog       | 5 ++++-
 config.inc.php3 | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 57be0d607..b456e9a4b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ $Id$
 $Source$
 
 
+2001-10-27  Olivier Müller  <om@omnis.ch>
+	* config.inc.php3: put the ENCRYPT function back to the config file.
+
 2001-10-26  Loïc Chapeaux  <lolo@phpheaven.net>
 	* tbl_change.php3, lines 198-205: fixed a crash with binary "characters".
 	  Bug was reported by Joshua Nye <josh at boxcarmedia.com> to the
@@ -40,7 +43,7 @@ $Source$
 	  - taken into account wildcards in the databases names get from the
 	    "mysql.db" table;
 	  - get all privilege at the begenning of the script;
-###	* released 2.2.1 revision. ###
+	* ### released 2.2.1 revision. ###
 
 2001-10-24  Marc Delisle  <lem9@users.sourceforge.net>
 	* main.php3 (for Loïc): a non-empty only_db was removing the MySQL links on
diff --git a/config.inc.php3 b/config.inc.php3
index a4acadb5d..974ce6c39 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -217,6 +217,7 @@ $cfgFunctions = array(
    'NOW',
    'PASSWORD',
    'MD5',
+   'ENCRYPT',
    'RAND',
    'LAST_INSERT_ID',
    'COUNT',