From: Matt Selsky Date: Mon, 3 Aug 2009 20:16:43 +0000 (-0400) Subject: Use parens to make negation more clear with instanceof. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c2a63724235bfde04462068277f855e2b649566d;p=horde.git Use parens to make negation more clear with instanceof. --- diff --git a/imp/folders.php b/imp/folders.php index 8975dd9c6..c6dad3611 100644 --- a/imp/folders.php +++ b/imp/folders.php @@ -155,7 +155,7 @@ case 'import_mbox': $import_folder = Horde_Util::getFormData('import_folder'); if (!empty($import_folder)) { $res = $browser->wasFileUploaded('mbox_upload', _("mailbox file")); - if (!$res instanceof PEAR_Error) { + if (!($res instanceof PEAR_Error)) { $res = $imp_folder->importMbox(Horde_String::convertCharset($import_folder, $charset, 'UTF7-IMAP'), $_FILES['mbox_upload']['tmp_name']); $mbox_name = basename(Horde_Util::dispelMagicQuotes($_FILES['mbox_upload']['name'])); if ($res === false) { diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php index c428ea411..c15924e42 100644 --- a/imp/lib/IMP.php +++ b/imp/lib/IMP.php @@ -152,7 +152,7 @@ class IMP $escapeName = htmlspecialchars($newName, ENT_COMPAT, Horde_Nls::getCharset()); error_reporting($old_error); - return (!empty($contact_link) && !$contact_link instanceof PEAR_Error) + return (!empty($contact_link) && !($contact_link instanceof PEAR_Error)) ? Horde::link(Horde::url($contact_link), sprintf(_("Go to address book entry of \"%s\""), $newName)) . $escapeName . '' : $escapeName; }