aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-01-15 21:43:29 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-01-15 21:43:29 +0100
commit11f0984d877692efda2b614be0316da8baa78315 (patch)
tree07887900250e0e8e2ec37754eedf87e050f4a4e5
parent660cfc2d2e6afe35088ec1317b07bfed63694af2 (diff)
parent1628a28e0c41e925d50082d94b5282b81904e863 (diff)
downloadforums-11f0984d877692efda2b614be0316da8baa78315.tar
forums-11f0984d877692efda2b614be0316da8baa78315.tar.gz
forums-11f0984d877692efda2b614be0316da8baa78315.tar.bz2
forums-11f0984d877692efda2b614be0316da8baa78315.tar.xz
forums-11f0984d877692efda2b614be0316da8baa78315.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
-rw-r--r--phpBB/index.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/index.php b/phpBB/index.php
index 5cd6d49ebc..5f2254ac7f 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -80,7 +80,7 @@ if ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets('
$leap_year_birthdays = '';
if ($now['mday'] == 28 && $now['mon'] == 2 && !$user->format_date(time(), 'L'))
{
- $leap_year_birthdays = " OR user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'";
+ $leap_year_birthdays = " OR u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'";
}
$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday