From 5ab6a47862f3197dabe013a0ed808875ec87854e Mon Sep 17 00:00:00 2001 From: Remi Date: Thu, 3 Mar 2016 12:07:38 +0100 Subject: [PATCH] fixes some PHP warnings --- bureau/admin/adm_list.php | 2 +- bureau/admin/main.php | 2 +- bureau/locales/de_DE/LC_MESSAGES/alternc | 2 +- bureau/locales/fr_FR/LC_MESSAGES/alternc | 2 +- bureau/locales/nl_NL/LC_MESSAGES/alternc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bureau/admin/adm_list.php b/bureau/admin/adm_list.php index c4db0a6a..af501319 100644 --- a/bureau/admin/adm_list.php +++ b/bureau/admin/adm_list.php @@ -61,7 +61,7 @@ if ($show == "all" && !$subadmin == 1 && $cuid != 2000) { } // show all accounts by default for admin-like accounts -if (($show=="")&&($subadmin == 1 || $cuid == 2000)) $show=all; +if (($show=="")&&($subadmin == 1 || $cuid == 2000)) $show="all"; if ($pattern && $pattern_type) { $accountList = $admin->get_list($show == 'all' ? 1 : 0, $creator, $pattern, $pattern_type); diff --git a/bureau/admin/main.php b/bureau/admin/main.php index 615d9c62..c82ddb45 100644 --- a/bureau/admin/main.php +++ b/bureau/admin/main.php @@ -107,7 +107,7 @@ if($admin->enabled) { } // if $admin->enabled $blocks=$hooks->invoke("hook_homepageblock"); -uasort($blocks, function($a, $b) {return $a->order<$b->order ? -1 : 1;}); +uasort($blocks, function($a, $b) {return $a->pos<$b->pos ? -1 : 1;}); foreach ($blocks as $v) { if (property_exists($v, "call")) { $func=$v->call; diff --git a/bureau/locales/de_DE/LC_MESSAGES/alternc b/bureau/locales/de_DE/LC_MESSAGES/alternc index 892d4152..b7c276e9 100644 --- a/bureau/locales/de_DE/LC_MESSAGES/alternc +++ b/bureau/locales/de_DE/LC_MESSAGES/alternc @@ -6080,7 +6080,7 @@ msgstr "Anzeige der Einschränkungen" #: ../class/m_quota.php:78 #, php-format msgid "%s%% of %s" -msgstr "%s%% von %s" +msgstr "%s% von %s" #: ../class/m_quota.php:78 ../class/m_quota.php:106 ../class/m_quota.php:197 msgid "quota_" diff --git a/bureau/locales/fr_FR/LC_MESSAGES/alternc b/bureau/locales/fr_FR/LC_MESSAGES/alternc index ea31b432..b957d4bd 100644 --- a/bureau/locales/fr_FR/LC_MESSAGES/alternc +++ b/bureau/locales/fr_FR/LC_MESSAGES/alternc @@ -6090,7 +6090,7 @@ msgstr "Quotas du compte AlternC" #: ../class/m_quota.php:78 #, php-format msgid "%s%% of %s" -msgstr "%s%% de %s" +msgstr "%s% de %s" #: ../class/m_quota.php:78 ../class/m_quota.php:106 ../class/m_quota.php:197 msgid "quota_" diff --git a/bureau/locales/nl_NL/LC_MESSAGES/alternc b/bureau/locales/nl_NL/LC_MESSAGES/alternc index 65f45b88..7a81916d 100644 --- a/bureau/locales/nl_NL/LC_MESSAGES/alternc +++ b/bureau/locales/nl_NL/LC_MESSAGES/alternc @@ -6075,7 +6075,7 @@ msgstr "Toon mijn quota's" #: ../class/m_quota.php:78 #, php-format msgid "%s%% of %s" -msgstr "%s%% van %s" +msgstr "%s% van %s" #: ../class/m_quota.php:78 ../class/m_quota.php:106 ../class/m_quota.php:197 msgid "quota_"