makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* 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
commit 979158f0a2
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/install/convertors/convert_phpbb20.php
View file

@ -134,7 +134,7 @@ $config_schema = array(
'avatar_filesize' => 'avatar_filesize', 'avatar_filesize' => 'avatar_filesize',
'avatar_max_width' => 'avatar_max_width', 'avatar_max_width' => 'avatar_max_width',
'avatar_max_height' => 'avatar_max_height', 'avatar_max_height' => 'avatar_max_height',
'default_dateformat' => 'default_dateformat', 'default_dateformat' => 'phpbb_set_encoding(default_dateformat)',
'board_timezone' => 'board_timezone', 'board_timezone' => 'board_timezone',
'allow_privmsg' => 'not(privmsg_disable)', 'allow_privmsg' => 'not(privmsg_disable)',
'gzip_compress' => 'gzip_compress', 'gzip_compress' => 'gzip_compress',

2
phpBB/language/en/install.php
View file

@ -128,7 +128,7 @@ $lang = array_merge($lang, array(
'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing <var>query_first</var>, %s (“%s”).', 'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing <var>query_first</var>, %s (“%s”).',
'DB_ERR_SELECT' => 'Error while running <code>SELECT</code> query.', 'DB_ERR_SELECT' => 'Error while running <code>SELECT</code> query.',
'DB_HOST' => 'Database server hostname or DSN', 'DB_HOST' => 'Database server hostname or DSN',
'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs. On PostgreSQL, use localhost to connect to the local server via UNIX domain socket and 127.0.0.1 to connect via TCP.', 'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs. On PostgreSQL, use localhost to connect to the local server via UNIX domain socket and 127.0.0.1 to connect via TCP. For SQLite, enter the full path to your database file.',
'DB_NAME' => 'Database name', 'DB_NAME' => 'Database name',
'DB_PASSWORD' => 'Database password', 'DB_PASSWORD' => 'Database password',
'DB_PORT' => 'Database server port', 'DB_PORT' => 'Database server port',

2
phpBB/styles/prosilver/template/login_body.html
View file

@ -2,7 +2,7 @@
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![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> </script>

2
phpBB/styles/prosilver/template/overall_footer.html
View file

@ -30,7 +30,7 @@
The phpBB Group : 2006 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 TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF --> <!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->

2
phpBB/styles/subsilver2/template/login_body.html
View file

@ -92,7 +92,7 @@
// <![CDATA[ // <![CDATA[
(function() (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) for (var i = 0; i < elements.length; ++i)
{ {
if (elements[i].tagName.toLowerCase() == 'input') if (elements[i].tagName.toLowerCase() == 'input')

2
phpBB/styles/subsilver2/template/overall_footer.html
View file

@ -14,7 +14,7 @@
<div id="wrapfooter"> <div id="wrapfooter">
<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF --> <!-- 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 TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span> <!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
</div> </div>