aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/coding-guidelines.html
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-07-08 22:54:26 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-07-08 22:54:26 +0200
commit01097a24b50a6ffa0662740bbf418399ed5623f2 (patch)
tree243924516f0af98657026b19fb90b8a6edcda5cf /phpBB/docs/coding-guidelines.html
parent2fbfb0e00436acc090a55e1739cf8bdd3b5c4497 (diff)
parentf576f42b4d3c607aee6b30154502adfed79301fb (diff)
downloadforums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar
forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar.gz
forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar.bz2
forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar.xz
forums-01097a24b50a6ffa0662740bbf418399ed5623f2.zip
Merge branch '3.1.x'
Conflicts: tests/template/template_includecss_test.php
Diffstat (limited to 'phpBB/docs/coding-guidelines.html')
-rw-r--r--phpBB/docs/coding-guidelines.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 4c5fe73543..26189235ef 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -6,7 +6,7 @@
<meta name="description" content="Ascraeus coding guidelines document" />
<title>phpBB3 &bull; Coding Guidelines</title>
-<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
+<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
</head>
@@ -300,9 +300,9 @@ PHPBB_QA (Set board to QA-Mode, which means the updater also c
<div class="indent">
<p><code>$current_user</code> is right, but <code>$currentuser</code> and <code> $currentUser</code> are not.</p>
</div>
-
+
<p>In JavaScript, variable names should use camel case:</p>
-
+
<div class="indent">
<p><code>currentUser</code> is right, but <code>currentuser</code> and <code>current_user</code> are not.</p>
</div>
@@ -431,7 +431,7 @@ function do_stuff()
...
}</pre>
</div>
-
+
<p>In JavaScript code, braces always go on the same line:</p>
<div class="codebox"><pre>
@@ -2568,7 +2568,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
</div></div>
<div>
- <a id="bottom" name="bottom" accesskey="z"></a>
+ <a id="bottom" accesskey="z"></a>
</div>
</body>