aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-01 18:46:14 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-01 18:46:14 +0000
commit85b99b642f547a13a3d9fbdcbf3e773bb1745dde (patch)
tree0bccd54f788be0e770527ed8ad060247929c95f9 /phpBB
parent6ca11b2d2b7a9e6420eec3b21e1531c1586c15c2 (diff)
downloadforums-85b99b642f547a13a3d9fbdcbf3e773bb1745dde.tar
forums-85b99b642f547a13a3d9fbdcbf3e773bb1745dde.tar.gz
forums-85b99b642f547a13a3d9fbdcbf3e773bb1745dde.tar.bz2
forums-85b99b642f547a13a3d9fbdcbf3e773bb1745dde.tar.xz
forums-85b99b642f547a13a3d9fbdcbf3e773bb1745dde.zip
allow mod authors to plug in info_ language files for population within the menu.
git-svn-id: file:///svn/phpbb/trunk@7819 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/docs/FAQ.html1
-rw-r--r--phpBB/docs/INSTALL.html1
-rw-r--r--phpBB/docs/README.html1
-rw-r--r--phpBB/docs/auth_api.html1
-rw-r--r--phpBB/docs/coding-guidelines.html1
-rw-r--r--phpBB/includes/functions_module.php16
7 files changed, 17 insertions, 5 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 865c8c5e0f..7bcda12e65 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -209,6 +209,7 @@ p a {
<li>[Fix] Search boxes not loosing session id (changing method from get to post) (Bug #12643)</li>
<li>[Fix] Make sure the automatic update is also working for those having fsockopen disabled</li>
<li>[Fix] Simulate recache of theme data on automatic update finished page - recaching it if css data changed</li>
+ <li>[Feature] Allow dropping in custom &quot;info_[module class]_*.php&quot; files to language/*/mods directory for inclusion into the menu structure without the need to modify phpBB language files for menu placements</li>
</ul>
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
index 6a010dc5ec..5bda802cd4 100644
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 185e18b7e0..8d9cac6cf3 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index 3c77d11cc5..ff579c1ceb 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html
index 7481be50a8..8f86ae2740 100644
--- a/phpBB/docs/auth_api.html
+++ b/phpBB/docs/auth_api.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 8fd904e7c0..14deabf135 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index bbb44d4b3d..1010de643b 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -123,6 +123,22 @@ class p_master
// Re-index (this is needed, else we are not able to array_slice later)
$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();
+
+ foreach (glob($user->lang_path . 'mods/info_' . strtolower($this->p_class) . '_*.' . $phpEx, GLOB_NOSORT) as $file)
+ {
+ $add_files[] = 'mods/' . substr(basename($file), 0, -(strlen($phpEx) + 1));
+ }
+
+ if (sizeof($add_files))
+ {
+ $user->add_lang($add_files);
+ }
+ }
+
// Now build the module array, but exclude completely empty categories...
$right_id = false;
$names = array();