diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-11-18 14:04:57 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-11-18 14:04:57 +0100 |
| commit | fbca4e9c7b2f723dde8e0034b7f5fedc9d0c8483 (patch) | |
| tree | d378ef768e8502dad9a4e0b72518ab28ecbf55cf /phpBB | |
| parent | b02cec86d40345f7ad28d0cca4e409766f0e65c2 (diff) | |
| parent | d917b2d7379dff75d7806142a70551bbb0382bd9 (diff) | |
| download | forums-fbca4e9c7b2f723dde8e0034b7f5fedc9d0c8483.tar forums-fbca4e9c7b2f723dde8e0034b7f5fedc9d0c8483.tar.gz forums-fbca4e9c7b2f723dde8e0034b7f5fedc9d0c8483.tar.bz2 forums-fbca4e9c7b2f723dde8e0034b7f5fedc9d0c8483.tar.xz forums-fbca4e9c7b2f723dde8e0034b7f5fedc9d0c8483.zip | |
Merge branch 'prep-release-3.0.8' into develop-olympus
* prep-release-3.0.8:
[ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
[ticket/9509] Fix a typo and wrong period placement
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/captcha_recaptcha.html | 3 | ||||
| -rw-r--r-- | phpBB/docs/coding-guidelines.html | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html index 702a4a1099..586c494868 100644 --- a/phpBB/adm/style/captcha_recaptcha.html +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -4,7 +4,8 @@ <script type="text/javascript"> // <![CDATA[ var RecaptchaOptions = { - lang : '{LA_RECAPTCHA_LANG}' + lang : '{LA_RECAPTCHA_LANG}', + theme : 'clean', }; // ]]> </script> diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 76afc79f99..5a73554741 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -2349,9 +2349,9 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2)) </li> </ul> - <a name="commitmessage"></a><h3>7.ii. Commit Messages and Reposiory Rules</h3> + <a name="commitmessage"></a><h3>7.ii. Commit Messages and Repository Rules</h3> - <p>Information on repository rules, such as commit messages can be found at <a href="http://wiki.phpbb.com/display/DEV/Git" title="phpBB Git Information">http://wiki.phpbb.com/display/DEV/Git</a></p>. + <p>Information on repository rules, such as commit messages can be found at <a href="http://wiki.phpbb.com/display/DEV/Git" title="phpBB Git Information">http://wiki.phpbb.com/display/DEV/Git</a>.</p> </div> |