aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/configuration.php24
-rw-r--r--admin/user_list.php2
2 files changed, 9 insertions, 17 deletions
diff --git a/admin/configuration.php b/admin/configuration.php
index c84ace657..676ce79c7 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -240,30 +240,22 @@ if ( isset( $_POST['submit'] ) )
else
{
//--------------------------------------------------------- data initialization
- $query = 'SELECT';
- foreach ( $conf_infos as $i => $conf_info ) {
- if ( $i > 0 ) $query.= ',';
- else $query.= ' ';
- $query.= $conf_info;
- }
+ $query = 'SELECT '.implode( ',', $conf_infos );
$query .= ' FROM '.PREFIX_TABLE.'config;';
$row = mysql_fetch_array( mysql_query( $query ) );
- foreach ( $conf_infos as $conf_info ) {
- $$conf_info = $row[$conf_info];
+ foreach ( $conf_infos as $info ) {
+ if ( isset( $row[$info] ) ) $$info = $row[$info];
+ else $$info = '';
}
- $query = 'SELECT';
- foreach ( $default_user_infos as $i => $default_user_info ) {
- if ( $i > 0 ) $query.= ',';
- else $query.= ' ';
- $query.= $default_user_info;
- }
+ $query = 'SELECT '.implode( ',', $default_user_infos );
$query.= ' FROM '.PREFIX_TABLE.'users';
$query.= " WHERE username = 'guest'";
$query.= ';';
$row = mysql_fetch_array( mysql_query( $query ) );
- foreach ( $default_user_infos as $default_user_info ) {
- $$default_user_info = $row[$default_user_info];
+ foreach ( $default_user_infos as $info ) {
+ if ( isset( $row[$info] ) ) $$info = $row[$info];
+ else $$info = '';
}
}
//----------------------------------------------------- template initialization
diff --git a/admin/user_list.php b/admin/user_list.php
index 2fbf3ccc4..f759365b0 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -150,7 +150,7 @@ else
}
$vtp->addSession( $sub, 'user' );
// checkbox for mail management if the user has a mail address
- if ( $row['mail_address'] != '' and $row['username'] != 'guest' )
+ if ( isset( $row['mail_address'] ) and $row['username'] != 'guest' )
{
$vtp->addSession( $sub, 'checkbox' );
$vtp->setVar( $sub, 'checkbox.name', 'mail-'.$row['id'] );