aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorDark❶ <dark-1@users.noreply.github.com>2018-10-29 00:28:43 +0530
committerDark❶ <dark-1@users.noreply.github.com>2018-10-29 00:28:43 +0530
commit9e375f32eb4d2eea65ba6fc929c82c65c6ab2d61 (patch)
treee361194d741707c252e76a055038add3e734d983 /phpBB
parented64a69760c40fcb4a4b50f82773575f6d997ff5 (diff)
downloadforums-9e375f32eb4d2eea65ba6fc929c82c65c6ab2d61.tar
forums-9e375f32eb4d2eea65ba6fc929c82c65c6ab2d61.tar.gz
forums-9e375f32eb4d2eea65ba6fc929c82c65c6ab2d61.tar.bz2
forums-9e375f32eb4d2eea65ba6fc929c82c65c6ab2d61.tar.xz
forums-9e375f32eb4d2eea65ba6fc929c82c65c6ab2d61.zip
[ticket/15858] Unapproved User(s) appearing as Guest in Team Page
PHPBB3-15858
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/memberlist.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 977857da59..d0dd70af01 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -173,7 +173,7 @@ switch ($mode)
'LEFT_JOIN' => array(
array(
'FROM' => array(USERS_TABLE => 'u'),
- 'ON' => 'ug.user_id = u.user_id AND ug.user_pending = 0',
+ 'ON' => 'ug.user_id = u.user_id',
),
array(
'FROM' => array(GROUPS_TABLE => 'g'),
@@ -181,7 +181,7 @@ switch ($mode)
),
),
- 'WHERE' => $db->sql_in_set('g.group_id', $group_ids, false, true),
+ 'WHERE' => $db->sql_in_set('g.group_id', $group_ids, false, true) . ' AND ug.user_pending = 0',
'ORDER_BY' => 'u.username_clean ASC',
);
colspan='2' class='sha1'>6101a0f154e6be0dff3d7ff40e4b2c42530f8ab5 (patch) tree40fb2bf9d03529eed783b2198b33537c5885e51f /perl-install/share/po/lv.po parentc254496fda9243909068a81e576426fd7e80f4c9 (diff)downloaddrakx-6101a0f154e6be0dff3d7ff40e4b2c42530f8ab5.tar
drakx-6101a0f154e6be0dff3d7ff40e4b2c42530f8ab5.tar.gz
drakx-6101a0f154e6be0dff3d7ff40e4b2c42530f8ab5.tar.bz2
drakx-6101a0f154e6be0dff3d7ff40e4b2c42530f8ab5.tar.xz
drakx-6101a0f154e6be0dff3d7ff40e4b2c42530f8ab5.zip
sync with code
Diffstat (limited to 'perl-install/share/po/lv.po')
-rw-r--r--perl-install/share/po/lv.po21
1 files changed, 16 insertions, 5 deletions
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index db6c42d4f..0e8dde4c7 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-07-03 16:51+0200\n"
+"POT-Creation-Date: 2016-07-12 14:22+0200\n"
"PO-Revision-Date: 2015-07-05 06:47+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Latvian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1790,6 +1790,11 @@ msgstr ""
msgid "\"%s\" already exists"
msgstr ""
+#: diskdrake/interactive.pm:1023
+#, c-format
+msgid "Setting up LVM"
+msgstr ""
+
#: diskdrake/interactive.pm:1048
#, c-format
msgid ""
@@ -2267,11 +2272,13 @@ msgid "You must have a ESP FAT32 partition mounted in /boot/EFI"
msgstr "Jums ir nepieciešama /boot/EFI montēta ESP FAT32 sadaļa"
#: fs/any.pm:79 fs/partitioning_wizard.pm:82
-#, fuzzy, c-format
-msgid "You must have a Boot BIOS partition"
-msgstr "Jums ir nepieciešama root sadaļa"
+#, c-format
+msgid ""
+"You must have a BIOS boot partition for non-UEFI GPT-partitioned disks. "
+"Please create one before continuing."
+msgstr ""
-#: fs/format.pm:111
+#: fs/format.pm:110
#, c-format
msgid "Creating and formatting file %s"
msgstr "Veidoju un formatēju failu %s"
@@ -6533,6 +6540,10 @@ msgstr ""
msgid "Installation failed"
msgstr "Instalēšana neizdevās"
+#, fuzzy
+#~ msgid "You must have a Boot BIOS partition"
+#~ msgstr "Jums ir nepieciešama root sadaļa"
+
#~ msgid "Please Wait... Applying the configuration"
#~ msgstr "Lūdzu uzgaidiet ... konfigurācijas piemērošana"