aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-07-29 13:39:50 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-07-29 13:39:50 +0000
commit7c79d0f860362f44a17fd0ed7aa75e3aa2de1860 (patch)
tree1029b5ed5fe9afeea274e4f93030e343a5edd45f
parent8c186d97c6a43f3fb71c2c5acb9fdd08f0c573e2 (diff)
downloadforums-7c79d0f860362f44a17fd0ed7aa75e3aa2de1860.tar
forums-7c79d0f860362f44a17fd0ed7aa75e3aa2de1860.tar.gz
forums-7c79d0f860362f44a17fd0ed7aa75e3aa2de1860.tar.bz2
forums-7c79d0f860362f44a17fd0ed7aa75e3aa2de1860.tar.xz
forums-7c79d0f860362f44a17fd0ed7aa75e3aa2de1860.zip
hmm, this seems to be a merge i forgot
git-svn-id: file:///svn/phpbb/trunk@8711 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/acp/acp_database.php2
-rw-r--r--phpBB/viewonline.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 561e88bbbf..c7c794dfba 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -2354,4 +2354,4 @@ function fgetd_seekless(&$fp, $delim, $read, $seek, $eof, $buffer = 8192)
return false;
}
-?>
+?> \ No newline at end of file
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index ea9bd3c463..891b7e91e4 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -225,8 +225,9 @@ while ($row = $db->sql_fetchrow($result))
{
case 'posting':
preg_match('#mode=([a-z]+)#', $row['session_page'], $on_page);
+ $posting_mode = (!empty($on_page[1])) ? $on_page[1] : '';
- switch ($on_page[1])
+ switch ($posting_mode)
{
case 'reply':
case 'quote':