Feature 928 :

partial revert of svn:4280 for external authentification.

git-svn-id: http://piwigo.org/svn/trunk@4357 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 2 insertions, 6 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 94fcdbb55..3ac0f5dae 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -494,16 +494,12 @@ $conf['apache_authentication'] = false;
 //
 // All informations contained in these tables and column are related to
 // piwigo_users table.
-//
-// You can use a different table for users, if you define associated constant
-// default configuration :
-// define('USERS_TABLE', $prefixeTable.'users');
+$conf['users_table'] = $prefixeTable.'users';
 
 // Other tables can be changed, if you define associated constants
 // Example:
 //   define('USER_INFOS_TABLE', 'pwg_main'.'user_infos');
 
-
 // user_fields : mapping between generic field names and table specific
 // field names. For example, in PWG, the mail address is names
 // "mail_address" and in punbb, it's called "email".
diff --git a/include/constants.php b/include/constants.php
index 9c29f0c91..7e429a91c 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -68,7 +68,7 @@ if (!defined('USER_ACCESS_TABLE'))
 if (!defined('USER_GROUP_TABLE'))
   define('USER_GROUP_TABLE', $prefixeTable.'user_group');
 if (!defined('USERS_TABLE'))
-  define('USERS_TABLE', $prefixeTable.'users');
+  define('USERS_TABLE', $conf['users_table']);
 if (!defined('USER_INFOS_TABLE'))
   define('USER_INFOS_TABLE', $prefixeTable.'user_infos');
 if (!defined('USER_FEED_TABLE'))