aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/coding-guidelines.html
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-08-21 15:09:52 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-08-21 15:09:52 +0000
commitff3843b39e714ef879a91f245ee6170534947503 (patch)
tree21231ba8af0a60ff6f41a533ee749af6a6e82f37 /phpBB/docs/coding-guidelines.html
parent5f4cd5b65c22a35e8ef3005a9025c2a3f579cfaa (diff)
downloadforums-ff3843b39e714ef879a91f245ee6170534947503.tar
forums-ff3843b39e714ef879a91f245ee6170534947503.tar.gz
forums-ff3843b39e714ef879a91f245ee6170534947503.tar.bz2
forums-ff3843b39e714ef879a91f245ee6170534947503.tar.xz
forums-ff3843b39e714ef879a91f245ee6170534947503.zip
- make sure the copyright/disclaimer is consistent
- two fixes... git-svn-id: file:///svn/phpbb/trunk@8061 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/docs/coding-guidelines.html')
-rw-r--r--phpBB/docs/coding-guidelines.html17
1 files changed, 15 insertions, 2 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 1efeadb111..a407be10ee 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -192,7 +192,7 @@ p a {
<!-- BEGIN DOCUMENT -->
-<p>These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow them as closely as possible.<br />This document is (c) 2006 phpBB Group, copying or redistribution is not allowed without permission.</p>
+<p>These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow them as closely as possible.</p>
<h1>Coding Guidelines</h1>
@@ -224,6 +224,7 @@ p a {
</ol>
</li>
<li><a href="#changes">Guidelines Changelog</a></li>
+ <li><a href="#disclaimer">Copyright and disclaimer</a></li>
</ol>
<hr />
@@ -803,7 +804,7 @@ $sql = 'SELECT *
<h3>sql_escape():</h3>
- <p>Always use <code>$db-&gt;sql_escape()</code> if you need to check for a string within an SQL statement (even if you are sure the variable can not contain single quotes - never trust your input), for example:</p>
+ <p>Always use <code>$db-&gt;sql_escape()</code> if you need to check for a string within an SQL statement (even if you are sure the variable cannot contain single quotes - never trust your input), for example:</p>
<blockquote><pre>
$sql = 'SELECT *
@@ -2355,6 +2356,18 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
</div>
<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="disclaimer"></a><h1>8. Copyright and disclaimer</h1>
+
+ <div class="paragraph">
+
+ <p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+
+</div>
+<a href="#top">Top</a>
<!-- END DOCUMENT -->