aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgweltas <gweltas@piwigo.org>2004-07-28 17:21:58 +0000
committergweltas <gweltas@piwigo.org>2004-07-28 17:21:58 +0000
commit52a3531e7e140077c7fd4ce82acfc085091fffb0 (patch)
treefd9673b2c25ef12bf28bff8bd2909027ec24d774 /include
parent4cec52cc3cd9a5031de6ee8fc2c56cd151eec3c9 (diff)
Installation procedure update
git-svn-id: http://piwigo.org/svn/trunk@463 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/constants.php3
-rw-r--r--include/functions_user.inc.php4
-rw-r--r--include/user.inc.php3
3 files changed, 6 insertions, 4 deletions
diff --git a/include/constants.php b/include/constants.php
index fb647d8b3..3ac5816f4 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -25,6 +25,9 @@
// | USA. |
// +-----------------------------------------------------------------------+
+// Default Language
+define('DEFAULT_LANGUAGE', 'en_UK.iso-8859-1');
+
// Debug Level
define('DEBUG', 1); // Debugging on
//define('DEBUG', 0); // Debugging off
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 0e1f8a628..5af68ad4e 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -218,7 +218,7 @@ function init_userprefs($userdata)
if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) )
{
- $language = 'en_EN';
+ $language = DEFAULT_LANGUAGE;
}
include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php');
@@ -227,7 +227,7 @@ function init_userprefs($userdata)
{
if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language. '/admin.lang.php')) )
{
- $language = 'en_EN';
+ $language = DEFAULT_LANGUAGE;
}
include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/admin.lang.php');
}
diff --git a/include/user.inc.php b/include/user.inc.php
index 65222f3f6..05b91d738 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -35,8 +35,7 @@ $infos = array( 'id', 'username', 'mail_address', 'nb_image_line',
'maxheight', 'expand', 'show_nb_comments', 'recent_period',
'template', 'forbidden_categories' );
-$query_user = 'SELECT '.implode( ',', $infos );
-$query_user.= ' FROM '.USERS_TABLE;
+$query_user = 'SELECT * FROM '.USERS_TABLE;
$query_done = false;
$user['is_the_guest'] = false;