From 951f793daeb358eace97cdd0b1c321766da55d48 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 18 Sep 2007 14:49:19 +0000 Subject: [PATCH] some fixes. :P - language authors may review their email template files... git-svn-id: file:///svn/phpbb/trunk@8092 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/index.php | 2 +- phpBB/adm/style/acp_styles.html | 1 + phpBB/adm/style/admin.css | 3 +-- phpBB/adm/style/install_convert.html | 2 +- phpBB/adm/swatch.php | 1 + phpBB/docs/CHANGELOG.html | 5 +++++ phpBB/docs/INSTALL.html | 3 ++- phpBB/includes/acp/acp_styles.php | 2 +- phpBB/includes/functions.php | 2 +- phpBB/includes/functions_privmsgs.php | 6 +++--- phpBB/includes/ucp/ucp_pm_viewmessage.php | 4 ++-- phpBB/install/install_convert.php | 6 +++--- phpBB/language/en/email/admin_welcome_inactive.txt | 4 +++- phpBB/language/en/email/coppa_resend_inactive.txt | 4 ++-- phpBB/language/en/email/coppa_welcome_inactive.txt | 4 ++-- phpBB/language/en/email/user_reactivate_account.txt | 2 +- phpBB/language/en/email/user_resend_inactive.txt | 2 +- phpBB/language/en/email/user_welcome.txt | 4 +++- phpBB/language/en/email/user_welcome_inactive.txt | 4 +++- phpBB/language/en/install.php | 4 +++- phpBB/memberlist.php | 4 ++-- phpBB/styles/prosilver/template/overall_footer.html | 2 +- phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 6 +++--- phpBB/styles/prosilver/template/viewtopic_body.html | 2 +- phpBB/styles/prosilver/theme/content.css | 1 - phpBB/styles/subsilver2/template/ucp_pm_message_header.html | 2 +- phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html | 2 +- phpBB/viewtopic.php | 2 +- 28 files changed, 50 insertions(+), 36 deletions(-) diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 84acd5c457..774832b436 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -276,7 +276,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $size = (int) $tpl_type[1]; $maxlength = (int) $tpl_type[2]; - $tpl = ' x '; + $tpl = ' x '; break; case 'textarea': diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index c555071fee..efa06aa538 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -237,6 +237,7 @@ } } } + //--> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 489b22a7d4..d8eaa81d6b 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -421,7 +421,6 @@ span.corners-bottom span { #menu li a:hover, #menu li a:hover span { text-decoration: none; background-color: #FFFFFF; - color: #BC2A4D; } @@ -703,7 +702,7 @@ input:hover, textarea:hover { border-top: 1px solid #AFAEAA; border-right: 1px solid #AFAEAA; border-bottom: 1px solid #AFAEAA; - background-color: #E9E9E2; + background-color: #E9E9E2; } input.langvalue, textarea.langvalue { diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index 783e89d6bf..506924720e 100755 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -30,7 +30,7 @@ {L_SOFTWARE} {L_VERSION} {L_AUTHOR} - {L_OPTIONS} + {L_CONVERT_OPTIONS} diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index 8573b9e530..9e537290ff 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -12,6 +12,7 @@ * @ignore */ define('IN_PHPBB', true); +define('ADMIN_START', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f2f6f56698..1f628a16a8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -210,6 +210,11 @@ p a {
  • [Change] Added Code for cleaning the confirm table to the session garbage collection
  • [Fix] Fixed token handling in jabber class for extremely spec-compilant XMPP server (Bug #14445)
  • [Fix] Disallowed galleries from using special characters (Bug #14466)
    • +
  • [Fix] Yahoo! IM no longer supporting non-yahoo users sending messages to them over the web. Needed to use the Yahoo! uri scheme which does not work for those not having the Yahoo! IM. (Bug #14353)
    • +
  • [Change] Listing the board url within the email text instead of appending it to the subject (Bug #14378)
    • +
  • [Fix] Always display the quote button as the most accessible one - edit is always before quote (Bug #14403)
    • +
  • [Fix] Use correct dimension (width x height) in ACP (Bug #14452)
    • +
  • [Fix] Only display PM history links if there are PM's to be displayed (Bug #14484)
    • diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 62fcf8e8be..6ddb1ce4b1 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -242,7 +242,8 @@ p a {
  • Oracle
    • -
  • PHP 4.3.3 or above with support for the database you intend to use.
    • +
  • PHP 4.3.3+ (>=4.3.3, >4.4.x, >5.x.x, >6.0-dev (compatible)) with support for the database you intend to use.
    • +
  • getimagesize() function need to be enabled.
  • These optional presence of the following modules within PHP will provide access to additional features, but they are not required.