Advanced Ads - Version 1.33.1

Version Description

(April 11, 2022) =

  • Fix: rename remaining instances of "Matched Content" AdSense ad type to "Multiplex"
Download this release

Release Info

Developer advancedads
Plugin Icon 128x128 Advanced Ads
Version 1.33.1
Comparing to
See all releases

Code changes from version 1.33.0 to 1.33.1

Files changed (12) hide show
  1. advanced-ads.php +2 -2
  2. languages/advanced-ads.pot +4 -4
  3. lib/composer/ClassLoader.php +1 -1
  4. lib/composer/autoload_classmap.php +1 -1
  5. lib/composer/autoload_namespaces.php +1 -1
  6. lib/composer/autoload_psr4.php +1 -1
  7. lib/composer/autoload_real.php +3 -12
  8. modules/gadsense/admin/views/adsense-ad-parameters.php +1 -1
  9. modules/gadsense/includes/class-ad-type-adsense.php +1 -1
  10. modules/gadsense/includes/class-mapi.php +2 -2
  11. modules/gadsense/includes/class-network-adsense.php +1 -1
  12. readme.txt +5 -1
advanced-ads.php CHANGED
@@ -12,7 +12,7 @@
12
  * Plugin Name: Advanced Ads
13
  * Plugin URI: https://wpadvancedads.com
14
  * Description: Manage and optimize your ads in WordPress
15
- * Version: 1.33.0
16
  * Author: Thomas Maier, Advanced Ads GmbH
17
  * Author URI: https://wpadvancedads.com
18
  * Text Domain: advanced-ads
@@ -39,7 +39,7 @@ define( 'ADVADS_BASE_DIR', dirname( ADVADS_BASE ) ); // directory of the plugin
39
  // general and global slug, e.g. to store options in WP.
40
  define( 'ADVADS_SLUG', 'advanced-ads' );
41
  define( 'ADVADS_URL', 'https://wpadvancedads.com/' );
42
- define( 'ADVADS_VERSION', '1.33.0' );
43
 
44
  // Autoloading, modules and functions.
45
 
12
  * Plugin Name: Advanced Ads
13
  * Plugin URI: https://wpadvancedads.com
14
  * Description: Manage and optimize your ads in WordPress
15
+ * Version: 1.33.1
16
  * Author: Thomas Maier, Advanced Ads GmbH
17
  * Author URI: https://wpadvancedads.com
18
  * Text Domain: advanced-ads
39
  // general and global slug, e.g. to store options in WP.
40
  define( 'ADVADS_SLUG', 'advanced-ads' );
41
  define( 'ADVADS_URL', 'https://wpadvancedads.com/' );
42
+ define( 'ADVADS_VERSION', '1.33.1' );
43
 
44
  // Autoloading, modules and functions.
45
 
languages/advanced-ads.pot CHANGED
@@ -2,14 +2,14 @@
2
  # This file is distributed under the same license as the Advanced Ads plugin.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: Advanced Ads 1.33.0\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/advanced-ads/\n"
7
  "Last-Translator: Thomas Maier <post@webzunft.de>\n"
8
  "Language-Team: webgilde <support@wpadvancedads.com>\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
- "POT-Creation-Date: 2022-03-29T10:48:03-04:00\n"
13
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14
  "X-Generator: WP-CLI 2.4.0\n"
15
  "X-Domain: advanced-ads\n"
@@ -3638,7 +3638,7 @@ msgid "Normal"
3638
  msgstr ""
3639
 
3640
  #: modules/gadsense/admin/views/adsense-ad-parameters.php:110
3641
- msgid "Multiplex ads"
3642
  msgstr ""
3643
 
3644
  #: modules/gadsense/admin/views/adsense-ad-parameters.php:112
@@ -3911,7 +3911,7 @@ msgstr ""
3911
  #: modules/gadsense/includes/class-mapi.php:1408
3912
  #: modules/gadsense/includes/class-network-adsense.php:514
3913
  msgctxt "AdSense ad type"
3914
- msgid "Matched Content"
3915
  msgstr ""
3916
 
3917
  #: modules/gadsense/includes/class-mapi.php:1393
2
  # This file is distributed under the same license as the Advanced Ads plugin.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: Advanced Ads 1.33.1\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/advanced-ads/\n"
7
  "Last-Translator: Thomas Maier <post@webzunft.de>\n"
8
  "Language-Team: webgilde <support@wpadvancedads.com>\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
+ "POT-Creation-Date: 2022-04-11T07:14:46-05:00\n"
13
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14
  "X-Generator: WP-CLI 2.4.0\n"
15
  "X-Domain: advanced-ads\n"
3638
  msgstr ""
3639
 
3640
  #: modules/gadsense/admin/views/adsense-ad-parameters.php:110
3641
+ msgid "Multiplex"
3642
  msgstr ""
3643
 
3644
  #: modules/gadsense/admin/views/adsense-ad-parameters.php:112
3911
  #: modules/gadsense/includes/class-mapi.php:1408
3912
  #: modules/gadsense/includes/class-network-adsense.php:514
3913
  msgctxt "AdSense ad type"
3914
+ msgid "Multiplex"
3915
  msgstr ""
3916
 
3917
  #: modules/gadsense/includes/class-mapi.php:1393
lib/composer/ClassLoader.php CHANGED
@@ -149,7 +149,7 @@ class ClassLoader
149
 
150
  /**
151
  * @return string[] Array of classname => path
152
- * @psalm-var array<string, string>
153
  */
154
  public function getClassMap()
155
  {
149
 
150
  /**
151
  * @return string[] Array of classname => path
152
+ * @psalm-return array<string, string>
153
  */
154
  public function getClassMap()
155
  {
lib/composer/autoload_classmap.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_classmap.php @generated by Composer
4
 
5
- $vendorDir = dirname(dirname(__FILE__));
6
  $baseDir = dirname($vendorDir);
7
 
8
  return array(
2
 
3
  // autoload_classmap.php @generated by Composer
4
 
5
+ $vendorDir = dirname(__DIR__);
6
  $baseDir = dirname($vendorDir);
7
 
8
  return array(
lib/composer/autoload_namespaces.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_namespaces.php @generated by Composer
4
 
5
- $vendorDir = dirname(dirname(__FILE__));
6
  $baseDir = dirname($vendorDir);
7
 
8
  return array(
2
 
3
  // autoload_namespaces.php @generated by Composer
4
 
5
+ $vendorDir = dirname(__DIR__);
6
  $baseDir = dirname($vendorDir);
7
 
8
  return array(
lib/composer/autoload_psr4.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_psr4.php @generated by Composer
4
 
5
- $vendorDir = dirname(dirname(__FILE__));
6
  $baseDir = dirname($vendorDir);
7
 
8
  return array(
2
 
3
  // autoload_psr4.php @generated by Composer
4
 
5
+ $vendorDir = dirname(__DIR__);
6
  $baseDir = dirname($vendorDir);
7
 
8
  return array(
lib/composer/autoload_real.php CHANGED
@@ -25,20 +25,11 @@ class ComposerAutoloaderInit_advanced_ads
25
  require __DIR__ . '/platform_check.php';
26
 
27
  spl_autoload_register(array('ComposerAutoloaderInit_advanced_ads', 'loadClassLoader'), true, true);
28
- self::$loader = $loader = new \AdvancedAds\Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
29
  spl_autoload_unregister(array('ComposerAutoloaderInit_advanced_ads', 'loadClassLoader'));
30
 
31
- $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
32
- if ($useStaticLoader) {
33
- require __DIR__ . '/autoload_static.php';
34
-
35
- call_user_func(\AdvancedAds\Composer\Autoload\ComposerStaticInit_advanced_ads::getInitializer($loader));
36
- } else {
37
- $classMap = require __DIR__ . '/autoload_classmap.php';
38
- if ($classMap) {
39
- $loader->addClassMap($classMap);
40
- }
41
- }
42
 
43
  $loader->setClassMapAuthoritative(true);
44
  $loader->register(true);
25
  require __DIR__ . '/platform_check.php';
26
 
27
  spl_autoload_register(array('ComposerAutoloaderInit_advanced_ads', 'loadClassLoader'), true, true);
28
+ self::$loader = $loader = new \AdvancedAds\Composer\Autoload\ClassLoader(\dirname(__DIR__));
29
  spl_autoload_unregister(array('ComposerAutoloaderInit_advanced_ads', 'loadClassLoader'));
30
 
31
+ require __DIR__ . '/autoload_static.php';
32
+ \AdvancedAds\Composer\Autoload\ComposerStaticInit_advanced_ads::getInitializer($loader)();
 
 
 
 
 
 
 
 
 
33
 
34
  $loader->setClassMapAuthoritative(true);
35
  $loader->register(true);
modules/gadsense/admin/views/adsense-ad-parameters.php CHANGED
@@ -107,7 +107,7 @@ if( $pub_id_errors ) : ?>
107
  <select name="unit-type" id="unit-type">
108
  <option value="normal" <?php selected( $unit_type, 'normal' ); ?>><?php _e( 'Normal', 'advanced-ads' ); ?></option>
109
  <option value="responsive" <?php selected( $unit_type, 'responsive' ); ?>><?php _e( 'Responsive', 'advanced-ads' ); ?></option>
110
- <option value="matched-content" <?php selected( $unit_type, 'matched-content' ); ?>><?php esc_html_e( 'Multiplex ads', 'advanced-ads' ); ?></option>
111
  <?php if ( $unit_type === 'link' ) : ?>
112
  <option value="link" <?php selected( $unit_type, 'link' ); ?>><?php _e( 'Link ads', 'advanced-ads' ); ?></option>
113
  <?php endif; ?>
107
  <select name="unit-type" id="unit-type">
108
  <option value="normal" <?php selected( $unit_type, 'normal' ); ?>><?php _e( 'Normal', 'advanced-ads' ); ?></option>
109
  <option value="responsive" <?php selected( $unit_type, 'responsive' ); ?>><?php _e( 'Responsive', 'advanced-ads' ); ?></option>
110
+ <option value="matched-content" <?php selected( $unit_type, 'matched-content' ); ?>><?php esc_html_e( 'Multiplex', 'advanced-ads' ); ?></option>
111
  <?php if ( $unit_type === 'link' ) : ?>
112
  <option value="link" <?php selected( $unit_type, 'link' ); ?>><?php _e( 'Link ads', 'advanced-ads' ); ?></option>
113
  <?php endif; ?>
modules/gadsense/includes/class-ad-type-adsense.php CHANGED
@@ -115,7 +115,7 @@ class Advanced_Ads_Ad_Type_Adsense extends Advanced_Ads_Ad_Type_Abstract {
115
  $unit_width = $ad->width;
116
  $unit_height = $ad->height;
117
  } else {
118
- // Responsive && matched content
119
  $unit_resize = ( isset( $content->resize ) ) ? $content->resize : 'auto';
120
  if ( 'auto' != $unit_resize ) {
121
  $extra_params = apply_filters( 'advanced-ads-gadsense-ad-param-data', $extra_params, $content, $ad );
115
  $unit_width = $ad->width;
116
  $unit_height = $ad->height;
117
  } else {
118
+ // Responsive && multiplex ads
119
  $unit_resize = ( isset( $content->resize ) ) ? $content->resize : 'auto';
120
  if ( 'auto' != $unit_resize ) {
121
  $extra_params = apply_filters( 'advanced-ads-gadsense-ad-param-data', $extra_params, $content, $ad );
modules/gadsense/includes/class-mapi.php CHANGED
@@ -1387,7 +1387,7 @@ class Advanced_Ads_AdSense_MAPI {
1387
  }
1388
 
1389
  if ( 'autorelaxed' === $format ) {
1390
- $str = _x( 'Matched Content', 'AdSense ad type', 'advanced-ads' );
1391
  } elseif ( 'fluid' === $format ) {
1392
  if ( 'in-article' === $layout ) {
1393
  $str = _x( 'In-article', 'AdSense ad type', 'advanced-ads' );
@@ -1405,7 +1405,7 @@ class Advanced_Ads_AdSense_MAPI {
1405
  $str = _x( 'Link', 'AdSense ad type', 'advanced-ads' );
1406
  break;
1407
  case 'MATCHED_CONTENT':
1408
- $str = _x( 'Matched Content', 'AdSense ad type', 'advanced-ads' );
1409
  break;
1410
  case 'ARTICLE':
1411
  $str = _x( 'In-article', 'AdSense ad type', 'advanced-ads' );
1387
  }
1388
 
1389
  if ( 'autorelaxed' === $format ) {
1390
+ $str = _x( 'Multiplex', 'AdSense ad type', 'advanced-ads' );
1391
  } elseif ( 'fluid' === $format ) {
1392
  if ( 'in-article' === $layout ) {
1393
  $str = _x( 'In-article', 'AdSense ad type', 'advanced-ads' );
1405
  $str = _x( 'Link', 'AdSense ad type', 'advanced-ads' );
1406
  break;
1407
  case 'MATCHED_CONTENT':
1408
+ $str = _x( 'Multiplex', 'AdSense ad type', 'advanced-ads' );
1409
  break;
1410
  case 'ARTICLE':
1411
  $str = _x( 'In-article', 'AdSense ad type', 'advanced-ads' );
modules/gadsense/includes/class-network-adsense.php CHANGED
@@ -511,7 +511,7 @@ class Advanced_Ads_Network_Adsense extends Advanced_Ads_Ad_Network {
511
  $data['pubId'] = $pub_id;
512
  $data['connected'] = $this->is_account_connected();
513
  $data['ad_types'] = array(
514
- 'matched_content' => _x( 'Matched Content', 'AdSense ad type', 'advanced-ads' ),
515
  'in_article' => _x( 'In-article', 'AdSense ad type', 'advanced-ads' ),
516
  'in_feed' => _x( 'In-feed', 'AdSense ad type', 'advanced-ads' ),
517
  'display' => _x( 'Display', 'AdSense ad type', 'advanced-ads' ),
511
  $data['pubId'] = $pub_id;
512
  $data['connected'] = $this->is_account_connected();
513
  $data['ad_types'] = array(
514
+ 'matched_content' => _x( 'Multiplex', 'AdSense ad type', 'advanced-ads' ),
515
  'in_article' => _x( 'In-article', 'AdSense ad type', 'advanced-ads' ),
516
  'in_feed' => _x( 'In-feed', 'AdSense ad type', 'advanced-ads' ),
517
  'display' => _x( 'Display', 'AdSense ad type', 'advanced-ads' ),
readme.txt CHANGED
@@ -4,7 +4,7 @@ Tags: ads, adsense, amp, ads.txt, ad rotations, ad blocker, amazon, banner, clic
4
  Requires at least: 4.9
5
  Tested up to: 5.9
6
  Requires PHP: 5.6
7
- Stable tag: 1.33.0
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -330,6 +330,10 @@ Yes. You can use plenty of [hooks](https://wpadvancedads.com/codex/) to customiz
330
 
331
  == Changelog ==
332
 
 
 
 
 
333
  = 1.33.0 (March 29, 2022) =
334
 
335
  - Improvement: introduce new header on plugin-related pages in WP Admin
4
  Requires at least: 4.9
5
  Tested up to: 5.9
6
  Requires PHP: 5.6
7
+ Stable tag: 1.33.1
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
330
 
331
  == Changelog ==
332
 
333
+ = 1.33.1 (April 11, 2022) =
334
+
335
+ - Fix: rename remaining instances of "Matched Content" AdSense ad type to "Multiplex"
336
+
337
  = 1.33.0 (March 29, 2022) =
338
 
339
  - Improvement: introduce new header on plugin-related pages in WP Admin