aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-24 15:20:32 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-24 15:20:32 +0000
commit959448c9353b36791ca51b9dc9d84d53b8db8072 (patch)
treea00ea6bab7ccb1cae4bbacaf21dda11c51a62e76 /phpBB
parent306581d905c508e6d4a7bafebce1b90dbedbbf4a (diff)
downloadforums-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')
-rw-r--r--phpBB/adm/style/acp_modules.html2
-rw-r--r--phpBB/adm/style/permission_mask.html6
-rw-r--r--phpBB/docs/CHANGELOG.html2
-rw-r--r--phpBB/includes/acp/acp_icons.php4
-rw-r--r--phpBB/includes/acp/acp_modules.php7
-rw-r--r--phpBB/includes/functions_module.php56
6 files changed, 49 insertions, 28 deletions
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index d241119fb6..24abb5c8d3 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -198,7 +198,7 @@
</form>
- <div class="clearfix">&nbsp;</div>
+ <div class="clearfix">&nbsp;</div><br style="clear: both;" />
<form id="mselect" method="post" action="{U_SEL_ACTION}">
<fieldset class="quick">
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index e4a8e8076a..1889f84d28 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -49,7 +49,11 @@
<!-- BEGIN category -->
<!-- IF p_mask.f_mask.category.S_FIRST_ROW -->
- <div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}"<!-- IF not p_mask.S_VIEW --> style="display: none;"<!-- ENDIF -->>
+ <!-- IF not p_mask.S_VIEW -->
+ <div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" style="display: none;">
+ <!-- ELSE -->
+ <div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+ <!-- ENDIF -->
<div class="permissions-category">
<ul>
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index b952e4d07d..1803b266a8 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -272,6 +272,8 @@ p a {
<li>[Fix] Limit author searches to firstpost, if selected (Bug #13579)</li>
<li>[Fix] store Date custom profile field defaults on multi-lingual boards </li>
<li>[Fix] Properly resync user post counts for users that have no posts (Bug #13581)</li>
+ <li>[Fix] Do not require space after , in smiley pak files (Bug #13647)</li>
+
</ul>
</div>
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);
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index cb5536eb1d..9db2c4fa25 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -124,29 +124,7 @@ class p_master
$this->module_cache['modules'] = array_merge($this->module_cache['modules']);
// Include MOD _info files for populating language entries within the menus
- if (file_exists($user->lang_path . 'mods'))
- {
- $add_files = array();
-
- $dir = @opendir($user->lang_path . 'mods');
-
- if ($dir)
- {
- while (($entry = readdir($dir)) !== false)
- {
- if (strpos($entry, 'info_' . strtolower($this->p_class) . '_') === 0 && substr(strrchr($entry, '.'), 1) == $phpEx)
- {
- $add_files[] = 'mods/' . substr(basename($entry), 0, -(strlen($phpEx) + 1));
- }
- }
- closedir($dir);
- }
-
- if (sizeof($add_files))
- {
- $user->add_lang($add_files);
- }
- }
+ $this->add_mod_info($this->p_class);
// Now build the module array, but exclude completely empty categories...
$right_id = false;
@@ -824,6 +802,38 @@ class p_master
}
}
}
+
+ /**
+ * Add custom MOD info language file
+ */
+ function add_mod_info($module_class)
+ {
+ global $user, $phpEx;
+
+ if (file_exists($user->lang_path . 'mods'))
+ {
+ $add_files = array();
+
+ $dir = @opendir($user->lang_path . 'mods');
+
+ if ($dir)
+ {
+ while (($entry = readdir($dir)) !== false)
+ {
+ if (strpos($entry, 'info_' . strtolower($module_class) . '_') === 0 && substr(strrchr($entry, '.'), 1) == $phpEx)
+ {
+ $add_files[] = 'mods/' . substr(basename($entry), 0, -(strlen($phpEx) + 1));
+ }
+ }
+ closedir($dir);
+ }
+
+ if (sizeof($add_files))
+ {
+ $user->add_lang($add_files);
+ }
+ }
+ }
}
?> \ No newline at end of file
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-02 14:58:21 +0000