aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-07-16 22:05:03 -0400
committerNils Adermann <naderman@naderman.de>2011-07-16 22:05:03 -0400
commit0f86034f03c8b81883aed2345d88d197f72c7491 (patch)
tree0529f9d57b59752d98a303321876d5ccc42e99e0 /phpBB/viewtopic.php
parentb3cdd1d16981c5992d1bffb97786084f9f02cad1 (diff)
parent0e85704d75c2edefdbdfb9d5542ab366744e65fb (diff)
downloadforums-0f86034f03c8b81883aed2345d88d197f72c7491.tar
forums-0f86034f03c8b81883aed2345d88d197f72c7491.tar.gz
forums-0f86034f03c8b81883aed2345d88d197f72c7491.tar.bz2
forums-0f86034f03c8b81883aed2345d88d197f72c7491.tar.xz
forums-0f86034f03c8b81883aed2345d88d197f72c7491.zip
Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympus
* github-bantu/ticket/10243: [ticket/10243] Adding a few unit tests for phpbb_gmgetdate(). [ticket/10243] Call phpbb_gmgetdate() from various places. [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 8b081b4aec..2f3a4cf2e4 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -995,7 +995,7 @@ $sql = $db->sql_build_query('SELECT', array(
$result = $db->sql_query($sql);
-$now = getdate(time() + $user->timezone + $user->dst - date('Z'));
+$now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
// Posts are stored in the $rowset array while $attach_list, $user_cache
// and the global bbcode_bitfield are built
>
-# $Id: sv.po,v 1.62 2003/02/01 09:08:58 menthos Exp $
+# $Id: sv.po,v 1.63 2003/03/08 14:39:21 menthos Exp $
#
# Varning: Meddelanden bör inte vara längre än ungefär 60 tecken då
# de annars inte får plats.
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: initscripts\n"
-"PO-Revision-Date: 2003-02-01 10:19+0100\n"
+"PO-Revision-Date: 2003-03-08 15:52+0100\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: <sv@li.org>\n"
"MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "Stoppar YP-mappningsservern: "
msgid ""
"$alias device ${DEVICE} does not seem to be present, delaying initialization."
msgstr ""
-"$alias-enheten ${DEVICE} verkar inte vara närvarande, fördröjer initiering."
+"$alias-enheten ${DEVICE} verkar inte finnas, fördröjer initiering."
#: /etc/rc.d/init.d/amd:96 /etc/rc.d/init.d/autofs:320
#: /etc/rc.d/init.d/bgpd:56 /etc/rc.d/init.d/irda:69 /etc/rc.d/init.d/ospfd:57
@@ -691,7 +691,7 @@ msgstr " misslyckades; det finns inte någon länk. Kontrollera kabeln?"
#: /etc/rc.d/init.d/mysqld:28
msgid "Initializing MySQL database: "
-msgstr "Initierar MySQL-databasen: "
+msgstr "Initierar MySQL-databas: "
#: /etc/rc.d/init.d/iscsi:19
msgid "Could not find /etc/iscsi.conf!"
@@ -914,8 +914,8 @@ msgid ""
"Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of "
"'$tunnelmtu', ignored"
msgstr ""
-"Varning: konfigurerade MTU:n \"$IPV6TO4_MTU\" för 6till4 överskrider största "
-"gränsen för \"$tunnelmtu\", ignorerar"
+"Varning: konfigurerade MTU:n \"$IPV6TO4_MTU\" för 6till4 överskrider "
+"maxgränsen för \"$tunnelmtu\", ignorerar"
#: /etc/rc.d/init.d/functions:159
msgid "Usage: killproc {program} [signal]"