diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-24 15:20:32 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-24 15:20:32 +0000 |
| commit | 959448c9353b36791ca51b9dc9d84d53b8db8072 (patch) | |
| tree | a00ea6bab7ccb1cae4bbacaf21dda11c51a62e76 /phpBB/includes/acp | |
| parent | 306581d905c508e6d4a7bafebce1b90dbedbbf4a (diff) | |
| download | forums-959448c9353b36791ca51b9dc9d84d53b8db8072.tar forums-959448c9353b36791ca51b9dc9d84d53b8db8072.tar.gz forums-959448c9353b36791ca51b9dc9d84d53b8db8072.tar.bz2 forums-959448c9353b36791ca51b9dc9d84d53b8db8072.tar.xz forums-959448c9353b36791ca51b9dc9d84d53b8db8072.zip | |
+ some fixes
git-svn-id: file:///svn/phpbb/trunk@7938 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 33e5bea058..538a46358d 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -410,7 +410,7 @@ class acp_icons // Make sure the pak_ary is valid foreach ($pak_ary as $pak_entry) { - if (preg_match_all("#'(.*?)', #", $pak_entry, $data)) + if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data)) { if ((sizeof($data[1]) != 4 && $mode == 'icons') || (sizeof($data[1]) != 6 && $mode == 'smilies')) @@ -473,7 +473,7 @@ class acp_icons foreach ($pak_ary as $pak_entry) { $data = array(); - if (preg_match_all("#'(.*?)', #", $pak_entry, $data)) + if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data)) { if ((sizeof($data[1]) != 4 && $mode == 'icons') || (sizeof($data[1]) != 6 && $mode == 'smilies')) diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 8148d648a3..8077bfa2b4 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -29,7 +29,7 @@ class acp_modules function main($id, $mode) { - global $db, $user, $auth, $template; + global $db, $user, $auth, $template, $module; global $config, $phpbb_admin_path, $phpbb_root_path, $phpEx; // Set a global define for modules we might include (the author is able to prevent execution of code by checking this constant) @@ -50,6 +50,11 @@ class acp_modules $user->add_lang('mcp'); } + if ($module->p_class != $this->module_class) + { + $module->add_mod_info($this->module_class); + } + $this->page_title = strtoupper($this->module_class); $this->parent_id = request_var('parent_id', 0); |