diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-06-10 19:03:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-06-10 19:03:38 +0000 |
| commit | 66d2e8c5b6c051108faf9e892b98dc706e937f99 (patch) | |
| tree | 1e144e655f9813e16835a8e5bad7c50903907567 | |
| parent | 38c7e4146fdc7b016aa486adee219c8263e49982 (diff) | |
| download | forums-66d2e8c5b6c051108faf9e892b98dc706e937f99.tar forums-66d2e8c5b6c051108faf9e892b98dc706e937f99.tar.gz forums-66d2e8c5b6c051108faf9e892b98dc706e937f99.tar.bz2 forums-66d2e8c5b6c051108faf9e892b98dc706e937f99.tar.xz forums-66d2e8c5b6c051108faf9e892b98dc706e937f99.zip | |
- sorry for this change paul. :( But it is needed for a memberlist change... hopefully not breaking anything for you. The only change is the check for the ids explicitly set to false to allow ids with "0".
git-svn-id: file:///svn/phpbb/trunk@5159 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/session.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index c85fa7a393..ca1913363e 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1156,9 +1156,9 @@ class auth { global $db; - $sql_user = ($user_id) ? ((!is_array($user_id)) ? "user_id = $user_id" : 'user_id IN (' . implode(', ', $user_id) . ')') : ''; - $sql_forum = ($forum_id) ? ((!is_array($forum_id)) ? "AND a.forum_id = $forum_id" : 'AND a.forum_id IN (' . implode(', ', $forum_id) . ')') : ''; - $sql_opts = ($opts) ? ((!is_array($opts)) ? "AND ao.auth_option = '$opts'" : 'AND ao.auth_option IN (' . implode(', ', preg_replace('#^[\s]*?(.*?)[\s]*?$#e', "\"'\" . \$db->sql_escape('\\1') . \"'\"", $opts)) . ')') : ''; + $sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? "user_id = $user_id" : 'user_id IN (' . implode(', ', $user_id) . ')') : ''; + $sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? "AND a.forum_id = $forum_id" : 'AND a.forum_id IN (' . implode(', ', $forum_id) . ')') : ''; + $sql_opts = ($opts !== false) ? ((!is_array($opts)) ? "AND ao.auth_option = '$opts'" : 'AND ao.auth_option IN (' . implode(', ', preg_replace('#^[\s]*?(.*?)[\s]*?$#e', "\"'\" . \$db->sql_escape('\\1') . \"'\"", $opts)) . ')') : ''; $hold_ary = array(); // First grab user settings ... each user has only one setting for each |