aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVic D'Elfant <vic@phpbb.com>2007-04-24 13:33:34 +0000
committerVic D'Elfant <vic@phpbb.com>2007-04-24 13:33:34 +0000
commitbb2dfe7f36094664a1122495a2de7b4f6950ae3b (patch)
treed7942b153b349e88b3522b0cb5d37450bd6c62b7
parentc4cae36c912c56e770f56503e839cc8cd69bc578 (diff)
downloadforums-bb2dfe7f36094664a1122495a2de7b4f6950ae3b.tar
forums-bb2dfe7f36094664a1122495a2de7b4f6950ae3b.tar.gz
forums-bb2dfe7f36094664a1122495a2de7b4f6950ae3b.tar.bz2
forums-bb2dfe7f36094664a1122495a2de7b4f6950ae3b.tar.xz
forums-bb2dfe7f36094664a1122495a2de7b4f6950ae3b.zip
- #10085
- Added notice about iso.txt to the coding guidelines git-svn-id: file:///svn/phpbb/trunk@7394 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/coding-guidelines.html2
-rw-r--r--phpBB/mcp.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index c3b6776dd2..c877b73dc3 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -1892,6 +1892,8 @@ div
<li><code>Language's local name</code></li>
<li><code>Authors information</code></li>
</ol>
+
+ <p><code>iso.txt</code> is automatically generated by the language pack submission system on phpBB.com. You don't have to create this file yourself if you plan on releasing your language pack on phpBB.com, but do keep in mind that phpBB itself does require this file to be present.</p>
<p>Because language tags themselves are meant to be machine read, they can be rather obtuse to humans and why descriptive strings as provided by <code>iso.txt</code> are needed. Whilst <code>en-US</code> could be fairly easily deduced to be "English as used in the United States", <code>de-CH</code> is more difficult less one happens to know that <code>de</code> is from "<span lang="de">Deutsch</span>", German for "German" and <code>CH</code> is the abbreviation of the official Latin name for Switzerland, "<span lang="la">Confoederatio Helvetica</span>".</p>
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index 1577c32de8..dc0b13c7b9 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -87,8 +87,7 @@ if ($post_id)
$topic_id = (int) $row['topic_id'];
$forum_id = (int) ($row['forum_id']) ? $row['forum_id'] : $forum_id;
}
-
-if ($topic_id && !$forum_id)
+else if ($topic_id)
{
$sql = 'SELECT forum_id
FROM ' . TOPICS_TABLE . "