aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-05-18 20:15:41 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-05-18 20:15:41 +0000
commite7a043a22a32cc5b4cca2637c1d9280571bdc577 (patch)
treec05f8f302e8a5e8f603a1b537d1394e05a5a71c8
parent53dc95d429a8fe741642a44b0489dea5087ae614 (diff)
downloadforums-e7a043a22a32cc5b4cca2637c1d9280571bdc577.tar
forums-e7a043a22a32cc5b4cca2637c1d9280571bdc577.tar.gz
forums-e7a043a22a32cc5b4cca2637c1d9280571bdc577.tar.bz2
forums-e7a043a22a32cc5b4cca2637c1d9280571bdc577.tar.xz
forums-e7a043a22a32cc5b4cca2637c1d9280571bdc577.zip
ok... still merge needed... now the fix is spread. :/
git-svn-id: file:///svn/phpbb/trunk@8566 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/session.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 53d3bcb9cc..cb1f3bd8d0 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1093,7 +1093,7 @@ class session
trigger_error($message);
}
- return ($banned) ? true : false;
+ return ($banned && $ban_row['ban_give_reason']) ? $ban_row['ban_give_reason'] : $banned;
}
/**