1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-22 16:22:58 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
  [ticket/9953] Set focus to password on re-authentication
  [ticket/9905] Add SQLite to the DSN description
  [ticket/9859] Remove years from the credit line.
This commit is contained in:
Andreas Fischer
2010-12-29 23:01:19 +01:00
6 changed files with 6 additions and 6 deletions

View File

@@ -2,7 +2,7 @@
<script type="text/javascript">
// <![CDATA[
onload_functions.push('document.getElementById("{USERNAME_CREDENTIAL}").focus();');
onload_functions.push('document.getElementById("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->").focus();');
// ]]>
</script>

View File

@@ -30,7 +30,7 @@
The phpBB Group : 2006
//-->
<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group
<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->

View File

@@ -92,7 +92,7 @@
// <![CDATA[
(function()
{
var elements = document.getElementsByName("{USERNAME_CREDENTIAL}");
var elements = document.getElementsByName("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->");
for (var i = 0; i < elements.length; ++i)
{
if (elements[i].tagName.toLowerCase() == 'input')

View File

@@ -14,7 +14,7 @@
<div id="wrapfooter">
<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group
<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
</div>