Merge pull request #1 from frc/fix/nested-ternary-operators

fix nested ternary operators (fatal error in php8)
frc · Sep 13, 2021 · a098c68 · a098c68
2 parents aa3e141 + d8c5e8d
commit a098c68
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/view/sendgrid_settings_test_email.php b/view/sendgrid_settings_test_email.php
@@ -19,25 +19,25 @@
           <tr valign="top">
             <th scope="row"><?php _e("To: "); ?></th>
             <td>
-              <input type="text" name="sendgrid_to" required="true" value="<?php echo isset( $success ) ? '' : isset( $to ) ? $to : '' ; ?>" size="20" class="regular-text">
+              <input type="text" name="sendgrid_to" required="true" value="<?php echo (isset( $success ) ? '' : isset( $to )) ? $to : '' ; ?>" size="20" class="regular-text">
             </td>
           </tr>
           <tr valign="top">
             <th scope="row"><?php _e("Subject: "); ?></th>
             <td>
-              <input type="text" name="sendgrid_subj" required="true" value="<?php echo isset( $success ) ? '' : isset( $subject ) ? $subject : '' ; ?>" size="20" class="regular-text">
+              <input type="text" name="sendgrid_subj" required="true" value="<?php echo (isset( $success ) ? '' : isset( $subject )) ? $subject : '' ; ?>" size="20" class="regular-text">
             </td>
           </tr>
           <tr valign="top">
             <th scope="row"><?php _e("Body: "); ?></th>
             <td>
-              <textarea name="sendgrid_body" rows="5" class="large-text"><?php echo isset( $success ) ? '' : isset( $body ) ? $body : '' ; ?></textarea>
+              <textarea name="sendgrid_body" rows="5" class="large-text"><?php echo (isset( $success ) ? '' : isset( $body )) ? $body : '' ; ?></textarea>
             </td>
           </tr>
           <tr valign="top">
             <th scope="row"><?php _e("Headers: "); ?></th>
             <td>
-              <textarea name="sendgrid_headers" rows="3" class="large-text"><?php echo isset( $success ) ? '' : isset( $headers ) ? $headers : ''; ?></textarea>
+              <textarea name="sendgrid_headers" rows="3" class="large-text"><?php echo (isset( $success ) ? '' : isset( $headers )) ? $headers : ''; ?></textarea>
             </td>
           </tr>
         </table>

diff --git a/wpsendgrid.php b/wpsendgrid.php
@@ -3,7 +3,7 @@
 Plugin Name: SendGrid
 Plugin URI: http://wordpress.org/plugins/sendgrid-email-delivery-simplified/
 Description: Email Delivery. Simplified. SendGrid's cloud-based email infrastructure relieves businesses of the cost and complexity of maintaining custom email systems. SendGrid provides reliable delivery, scalability and real-time analytics along with flexible APIs that make custom integration a breeze.
-Version: 1.11.10
+Version: 1.11.11
 Author: SendGrid
 Author URI: http://sendgrid.com
 Text Domain: sendgrid-email-delivery-simplified