Changeset 13297
- Timestamp:
- 07/12/2022 06:41:40 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.github/workflows/unit-tests.yml
r13285 r13297 20 20 wp_version: '6.0' 21 21 - php: '7.4' 22 wp_version: '5. 4'22 wp_version: '5.7' 23 23 env: 24 24 WP_ENV_PHP_VERSION: ${{ matrix.php }} … … 60 60 61 61 - name: Adjust wp-phpunit version 62 run: if [ ${{ env.WP_VERSION }} == '5. 4' ]; then composer require --dev "wp-phpunit/wp-phpunit:5.4"; fi62 run: if [ ${{ env.WP_VERSION }} == '5.7' ]; then composer require --dev "wp-phpunit/wp-phpunit:5.7"; fi 63 63 64 64 - name: Cache node modules -
trunk/bp-loader.php
r13238 r13297 21 21 * Domain Path: /bp-languages/ 22 22 * Requires PHP: 5.6 23 * Requires at least: 5. 423 * Requires at least: 5.7 24 24 * Version: 11.0.0-alpha 25 25 */ -
trunk/src/bp-core/bp-core-moderation.php
r12698 r13297 240 240 // Get the moderation keys. 241 241 $disallowed = get_option( 'disallowed_keys' ); 242 243 // Support for WP < 5.5.244 if ( false === $disallowed ) {245 $disallowed = get_option( 'blacklist_keys' );246 }247 248 242 $disallowed = trim( $disallowed ); 249 243 -
trunk/src/bp-core/classes/class-bp-phpmailer.php
r12708 r13297 27 27 public function bp_email( BP_Email $email ) { 28 28 static $phpmailer = null; 29 $phpmailer_is_6_0 = false;30 29 31 30 /** … … 40 39 $phpmailer = apply_filters( 'bp_phpmailer_object', $phpmailer ); 41 40 42 /**43 * WordPress 5.5 deprecated version 5.2 of PHPMailer44 * and is now using version 6.0 of PHPMailer.45 */46 if ( bp_get_major_wp_version() >= 5.5 ) {47 $phpmailer_is_6_0 = true;41 if ( ! ( $phpmailer instanceof PHPMailer\PHPMailer\PHPMailer ) ) { 42 if ( ! class_exists( 'PHPMailer\\PHPMailer\\PHPMailer' ) ) { 43 require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php'; 44 require_once ABSPATH . WPINC . '/PHPMailer/SMTP.php'; 45 require_once ABSPATH . WPINC . '/PHPMailer/Exception.php'; 46 } 48 47 49 if ( ! ( $phpmailer instanceof PHPMailer\PHPMailer\PHPMailer ) ) { 50 if ( ! class_exists( 'PHPMailer\\PHPMailer\\PHPMailer' ) ) { 51 require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php'; 52 require_once ABSPATH . WPINC . '/PHPMailer/SMTP.php'; 53 require_once ABSPATH . WPINC . '/PHPMailer/Exception.php'; 54 } 55 56 $phpmailer = new PHPMailer\PHPMailer\PHPMailer( true ); 57 } 58 } else { 59 if ( ! ( $phpmailer instanceof PHPMailer ) ) { 60 if ( ! class_exists( 'PHPMailer' ) ) { 61 require_once ABSPATH . WPINC . '/class-phpmailer.php'; 62 require_once ABSPATH . WPINC . '/class-smtp.php'; 63 } 64 65 $phpmailer = new PHPMailer( true ); 66 } 48 $phpmailer = new PHPMailer\PHPMailer\PHPMailer( true ); 67 49 } 68 50 … … 87 69 */ 88 70 $phpmailer->Subject = $email->get_subject( 'replace-tokens' ); 89 if ( $phpmailer_is_6_0 ) { 90 $content_plaintext = PHPMailer\PHPMailer\PHPMailer::normalizeBreaks( $email->get_content_plaintext( 'replace-tokens' ) ); 91 } else { 92 $content_plaintext = PHPMailer::normalizeBreaks( $email->get_content_plaintext( 'replace-tokens' ) ); 93 } 71 $content_plaintext = PHPMailer\PHPMailer\PHPMailer::normalizeBreaks( $email->get_content_plaintext( 'replace-tokens' ) ); 94 72 95 73 if ( $email->get( 'content_type' ) === 'html' ) { … … 103 81 104 82 $recipient = $email->get_from(); 105 if ( $phpmailer_is_6_0 ) { 106 try { 107 $phpmailer->setFrom( $recipient->get_address(), $recipient->get_name(), false ); 108 } catch ( PHPMailer\PHPMailer\Exception $e ) { 109 } 110 } else { 111 try { 112 $phpmailer->SetFrom( $recipient->get_address(), $recipient->get_name(), false ); 113 } catch ( phpmailerException $e ) { 114 } 83 try { 84 $phpmailer->setFrom( $recipient->get_address(), $recipient->get_name(), false ); 85 } catch ( PHPMailer\PHPMailer\Exception $e ) { 115 86 } 116 87 117 88 $recipient = $email->get_reply_to(); 118 if ( $phpmailer_is_6_0 ) { 119 try { 120 $phpmailer->addReplyTo( $recipient->get_address(), $recipient->get_name() ); 121 } catch ( PHPMailer\PHPMailer\Exception $e ) { 122 } 123 } else { 124 try { 125 $phpmailer->addReplyTo( $recipient->get_address(), $recipient->get_name() ); 126 } catch ( phpmailerException $e ) { 127 } 89 try { 90 $phpmailer->addReplyTo( $recipient->get_address(), $recipient->get_name() ); 91 } catch ( PHPMailer\PHPMailer\Exception $e ) { 128 92 } 129 93 130 94 $recipients = $email->get_to(); 131 if ( $phpmailer_is_6_0 ) { 132 foreach ( $recipients as $recipient ) { 133 try { 134 $phpmailer->AddAddress( $recipient->get_address(), $recipient->get_name() ); 135 } catch ( PHPMailer\PHPMailer\Exception $e ) { 136 } 137 } 138 } else { 139 foreach ( $recipients as $recipient ) { 140 try { 141 $phpmailer->AddAddress( $recipient->get_address(), $recipient->get_name() ); 142 } catch ( phpmailerException $e ) { 143 } 95 foreach ( $recipients as $recipient ) { 96 try { 97 $phpmailer->AddAddress( $recipient->get_address(), $recipient->get_name() ); 98 } catch ( PHPMailer\PHPMailer\Exception $e ) { 144 99 } 145 100 } 146 101 147 102 $recipients = $email->get_cc(); 148 if ( $phpmailer_is_6_0 ) { 149 foreach ( $recipients as $recipient ) { 150 try { 151 $phpmailer->AddCc( $recipient->get_address(), $recipient->get_name() ); 152 } catch ( PHPMailer\PHPMailer\Exception $e ) { 153 } 154 } 155 } else { 156 foreach ( $recipients as $recipient ) { 157 try { 158 $phpmailer->AddCc( $recipient->get_address(), $recipient->get_name() ); 159 } catch ( phpmailerException $e ) { 160 } 103 foreach ( $recipients as $recipient ) { 104 try { 105 $phpmailer->AddCc( $recipient->get_address(), $recipient->get_name() ); 106 } catch ( PHPMailer\PHPMailer\Exception $e ) { 161 107 } 162 108 } 163 109 164 110 $recipients = $email->get_bcc(); 165 if ( $phpmailer_is_6_0 ) { 166 foreach ( $recipients as $recipient ) { 167 try { 168 $phpmailer->AddBcc( $recipient->get_address(), $recipient->get_name() ); 169 } catch ( PHPMailer\PHPMailer\Exception $e ) { 170 } 171 } 172 } else { 173 foreach ( $recipients as $recipient ) { 174 try { 175 $phpmailer->AddBcc( $recipient->get_address(), $recipient->get_name() ); 176 } catch ( phpmailerException $e ) { 177 } 111 foreach ( $recipients as $recipient ) { 112 try { 113 $phpmailer->AddBcc( $recipient->get_address(), $recipient->get_name() ); 114 } catch ( PHPMailer\PHPMailer\Exception $e ) { 178 115 } 179 116 } … … 196 133 do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) ); 197 134 198 if ( $phpmailer_is_6_0 ) { 199 try { 200 return $phpmailer->Send(); 201 } catch ( PHPMailer\PHPMailer\Exception $e ) { 202 return new WP_Error( $e->getCode(), $e->getMessage(), $email ); 203 } 204 } else { 205 try { 206 return $phpmailer->Send(); 207 } catch ( phpmailerException $e ) { 208 return new WP_Error( $e->getCode(), $e->getMessage(), $email ); 209 } 135 try { 136 return $phpmailer->Send(); 137 } catch ( PHPMailer\PHPMailer\Exception $e ) { 138 return new WP_Error( $e->getCode(), $e->getMessage(), $email ); 210 139 } 211 140 } -
trunk/src/bp-loader.php
r13238 r13297 21 21 * Domain Path: /bp-languages/ 22 22 * Requires PHP: 5.6 23 * Requires at least: 5. 423 * Requires at least: 5.7 24 24 * Version: 11.0.0-alpha 25 25 */ -
trunk/src/readme.txt
r13284 r13297 5 5 License URI: https://www.gnu.org/licenses/gpl-2.0.html 6 6 Requires PHP: 5.6 7 Requires at least: 5. 47 Requires at least: 5.7 8 8 Tested up to: 6.0 9 9 Stable tag: 10.3.0
Note: See TracChangeset
for help on using the changeset viewer.