Fix PHP Fatal error: Can't use function return value in write context

10 years ago · d5f7490b08
1 changed files with 4 additions and 4 deletions
--- a/program/lib/Roundcube/rcube_addressbook.php
+++ b/program/lib/Roundcube/rcube_addressbook.php
@ -550,12 +550,12 @@ abstract class rcube_addressbook
        // fallbacks...
        if ($fn === '') {
            // ... display name
-            if (!empty(trim($contact['name']))) {
-                $fn = $contact['name'];
+            if ($name = trim($contact['name'])) {
+                $fn = $name;
            }
            // ... organization
-            else if (!empty($contact['organization'])) {
-                $fn = $contact['organization'];
+            else if ($org = trim($contact['organization'])) {
+                $fn = $org;
            }
            // ... email address
            else if (($email = self::get_col_values('email', $contact, true)) && !empty($email)) {