Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #473

Merged
merged 4 commits into from May 28, 2013
Merged

fixes #473

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions sources/subs/Auth.subs.php
Expand Up @@ -690,18 +690,14 @@ function deleteOnline($session)
*/
function isFirstLogin($id_member)
{
$db = database();

$isFirstLogin = false;

// First login?
require_once(SUBSDIR . '/Members.subs.php');
$member = getBasicMemberData($id_member, array('moderation' => true));

return !empty($member) && $member['last_login'] == 0;
}

function findUser($where, $whereparams)
function findUser($where, $where_params)
{
$db = database();

Expand Down
4 changes: 2 additions & 2 deletions sources/subs/Boards.subs.php
Expand Up @@ -909,7 +909,7 @@ function getBoardTree()
*/
function getBoardList($boardListOptions = array(), $simple = false)
{
global $user_info;
global $modSettings;

$db = database();

Expand Down Expand Up @@ -1615,4 +1615,4 @@ function incrementBoard($board, $stat)
'board' => $board,
)
);
}
}
4 changes: 1 addition & 3 deletions sources/subs/Menu.subs.php
Expand Up @@ -29,9 +29,7 @@
*/
function createMenu($menuData, $menuOptions = array())
{
global $context, $settings, $options, $txt, $modSettings, $scripturl, $user_info, $options;

$db = database();
global $context, $settings, $options, $txt, $scripturl, $user_info, $options;

// Work out where we should get our images from.
$context['menu_image_path'] = file_exists($settings['theme_dir'] . '/images/admin/change_menu.png') ? $settings['images_url'] . '/admin' : $settings['default_images_url'] . '/admin';
Expand Down