aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-11 16:20:11 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-11 16:20:11 +0000
commit66c2a18b8200d86c09cf690f3302969ed3b5488c (patch)
tree919a29067e0171e4e639c5fd07fffa09a98b7f90
parent8cf0bc433e6777ee6c073998d8908525b8a0dc57 (diff)
downloadforums-66c2a18b8200d86c09cf690f3302969ed3b5488c.tar
forums-66c2a18b8200d86c09cf690f3302969ed3b5488c.tar.gz
forums-66c2a18b8200d86c09cf690f3302969ed3b5488c.tar.bz2
forums-66c2a18b8200d86c09cf690f3302969ed3b5488c.tar.xz
forums-66c2a18b8200d86c09cf690f3302969ed3b5488c.zip
seems like capitalizing menu titles introduced some problems. :) Also it might look strange for some languages - so therefore it is better be done within the language file directly.
git-svn-id: file:///svn/phpbb/trunk@6565 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/adm/style/admin.css1
-rw-r--r--phpBB/includes/acp/acp_main.php8
-rw-r--r--phpBB/includes/functions_messenger.php2
-rw-r--r--phpBB/styles/subSilver/theme/stylesheet.css1
4 files changed, 4 insertions, 8 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 889754a772..49ffae98af 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -229,7 +229,6 @@ span.corners-top span, span.corners-bottom span {
width: 20%;
font-size: 100%;
padding: 0;
- text-transform: capitalize;
}
#menu p {
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 4506c8f7c7..a321057fa2 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -74,34 +74,33 @@ class acp_main
FROM ' . POSTS_TABLE . '
WHERE post_approved = 1';
$result = $db->sql_query($sql);
-
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
+
set_config('num_posts', (int) $row['stat'], true);
$sql = 'SELECT COUNT(topic_id) AS stat
FROM ' . TOPICS_TABLE . '
WHERE topic_approved = 1';
$result = $db->sql_query($sql);
-
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
+
set_config('num_topics', (int) $row['stat'], true);
$sql = 'SELECT COUNT(user_id) AS stat
FROM ' . USERS_TABLE . '
WHERE user_type IN (' . USER_NORMAL . ',' . USER_FOUNDER . ')';
$result = $db->sql_query($sql);
-
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
+
set_config('num_users', (int) $row['stat'], true);
$sql = 'SELECT COUNT(attach_id) as stat
FROM ' . ATTACHMENTS_TABLE . '
WHERE is_orphan = 0';
$result = $db->sql_query($sql);
-
set_config('num_files', (int) $db->sql_fetchfield('stat'), true);
$db->sql_freeresult($result);
@@ -109,7 +108,6 @@ class acp_main
FROM ' . ATTACHMENTS_TABLE . '
WHERE is_orphan = 0';
$result = $db->sql_query($sql);
-
set_config('upload_dir_size', (int) $db->sql_fetchfield('stat'), true);
$db->sql_freeresult($result);
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index f2640ff6ab..80a5f939f6 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -1370,7 +1370,7 @@ class smtp_class
* may produce less output but it's questionable as to its worth in this
* scenario.
*
-* This version is using base64 encoded date. The downside of this
+* This version is using base64 encoded data. The downside of this
* is if the mail client does not understand this encoding the user
* is basically doomed with an unreadable subject.
*/
diff --git a/phpBB/styles/subSilver/theme/stylesheet.css b/phpBB/styles/subSilver/theme/stylesheet.css
index c585aa6c92..69796cb3a5 100644
--- a/phpBB/styles/subSilver/theme/stylesheet.css
+++ b/phpBB/styles/subSilver/theme/stylesheet.css
@@ -227,7 +227,6 @@ p.topicdetails {
margin: 0px;
color: black;
font-weight: bold;
- text-transform: capitalize;
}
.pagination {