Use parens to make negation more clear with instanceof.
authorMatt Selsky <selsky@columbia.edu>
Mon, 3 Aug 2009 20:16:43 +0000 (16:16 -0400)
committerMatt Selsky <selsky@columbia.edu>
Mon, 3 Aug 2009 20:24:18 +0000 (16:24 -0400)
imp/folders.php
imp/lib/IMP.php

index 8975dd9..c6dad36 100644 (file)
@@ -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) {
index c428ea4..c15924e 100644 (file)
@@ -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 . '</a>'
             : $escapeName;
     }