aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/coding-guidelines.html
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-07-13 13:14:37 -0400
committerNils Adermann <naderman@naderman.de>2013-07-13 13:14:37 -0400
commit2aff3b19dfaebbbf561abbce9292aa1be53e8ef6 (patch)
tree653c5a9f23592b4ffd9f42908a6c25ae45142792 /phpBB/docs/coding-guidelines.html
parent9a486539c3abcf927aabd1fa48c141a0aee1014d (diff)
parentee3d4199bbb9d5e5374fe8e04ae9e9f4c6c0ec18 (diff)
downloadforums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.tar
forums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.tar.gz
forums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.tar.bz2
forums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.tar.xz
forums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.zip
Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release-3.0.12
* github-marc1706/ticket/11112: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
Diffstat (limited to 'phpBB/docs/coding-guidelines.html')
-rw-r--r--phpBB/docs/coding-guidelines.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index dd0ee0a82f..a541fe8866 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -1191,7 +1191,7 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
<span class="comment">&lt;!-- INCLUDEPHP somefile&#46;php --&gt;</span>
</pre></div>
-<p>it will be included and executed inline.<br /><br />A note, it is very much encouraged that template designers do not include PHP. The ability to include raw PHP was introduced primarily to allow end users to include banner code, etc. without modifying multiple files (as with 2.0.x). It was not intended for general use ... hence <!-- w --><a href="http://www.phpbb.com">www.phpbb.com</a><!-- w --> will <strong>not</strong> make available template sets which include PHP. And by default templates will have PHP disabled (the admin will need to specifically activate PHP for a template).</p>
+<p>it will be included and executed inline.<br /><br />A note, it is very much encouraged that template designers do not include PHP. The ability to include raw PHP was introduced primarily to allow end users to include banner code, etc. without modifying multiple files (as with 2.0.x). It was not intended for general use ... hence <!-- w --><a href="https://www.phpbb.com">www.phpbb.com</a><!-- w --> will <strong>not</strong> make available template sets which include PHP. And by default templates will have PHP disabled (the admin will need to specifically activate PHP for a template).</p>
<h4>Conditionals/Control structures</h4>
<p>The most significant addition to 3.0.x are conditions or control structures, &quot;if something then do this else do that&quot;. The system deployed is very similar to Smarty. This may confuse some people at first but it offers great potential and great flexibility with a little imagination. In their most simple form these constructs take the form:</p>
@@ -2323,7 +2323,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
<div class="content">
- <p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+ <p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="https://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
</div>