aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_module.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-01-30 16:01:15 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-01-30 16:01:15 +0000
commit325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf (patch)
tree5d5d1e996619f25c282a0fa9e4cb42531c3f2b85 /phpBB/includes/functions_module.php
parentc7821700dd36899a53b8afe9f859d7a40a23e7b4 (diff)
downloadforums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar
forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar.gz
forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar.bz2
forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar.xz
forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.zip
One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)
Although i somehow mistakingly got #20445 and #15249 into it. :/ Removing s_watching_img from watch_topic_forum() function (Bug #20445) Changing order for post review if more than one post affected (Bug #15249) Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479) Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738) Tiny code fixes (Bug #20165, #20025, #19795, #14804) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8350 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_module.php')
-rw-r--r--phpBB/includes/functions_module.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index b58993d878..f4ee454033 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -677,7 +677,7 @@ class p_master
}
// Select first id we can get
- if (!$current_id && (in_array($item_ary['id'], array_keys($this->module_cache['parents'])) || $item_ary['id'] == $this->p_id))
+ if (!$current_id && (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id))
{
$current_id = $item_ary['id'];
}
@@ -710,7 +710,7 @@ class p_master
$tpl_ary = array(
'L_TITLE' => $item_ary['lang'],
- 'S_SELECTED' => (in_array($item_ary['id'], array_keys($this->module_cache['parents'])) || $item_ary['id'] == $this->p_id) ? true : false,
+ 'S_SELECTED' => (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id) ? true : false,
'U_TITLE' => $u_title
);
@@ -719,7 +719,7 @@ class p_master
$tpl_ary = array(
'L_TITLE' => $item_ary['lang'],
- 'S_SELECTED' => (in_array($item_ary['id'], array_keys($this->module_cache['parents'])) || $item_ary['id'] == $this->p_id) ? true : false,
+ 'S_SELECTED' => (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id) ? true : false,
'U_TITLE' => $u_title
);