Changeset 2910849

Timestamp:

05/10/2023 06:01:24 PM (3 years ago)

Author:

photocrati

Message:

Released 3.36

Location:

nextgen-gallery/trunk

Files:

• changelog.txt (modified) (1 diff)
• composer.lock (modified) (2 diffs)
• nggallery.php (modified) (2 diffs)
• products/photocrati_nextgen/modules/nextgen_basic_tagcloud/package.module.nextgen_basic_tagcloud.php (modified) (1 diff)
• products/photocrati_nextgen/modules/ngglegacy/admin/manage-images.php (modified) (1 diff)
• products/photocrati_nextgen/modules/ngglegacy/admin/manage.php (modified) (1 diff)
• products/photocrati_nextgen/modules/third_party_compat/module.third_party_compat.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/autoload_real.php (modified) (3 diffs)
• vendor/composer/autoload_static.php (modified) (2 diffs)

nextgen-gallery/trunk/changelog.txt

@@ -1 +1 @@
 NextGEN Gallery
 by Imagely
+
+= V3.36  - 05.10.2023 =
+* NEW:     Added support for WP-Sweep so that NextGEN's tags will not be automatically removed.
+* NEW:     Added NextGEN Gallery images to RankMath SEO's sitemaps.
+* Fixed:   A JS error could trigger on the Manage Gallery page in some circumstances.
+* Fixed:   In some specific situations NextGEN Gallery could cause an infinite loop on all pages.
+* Fixed:   Manage Gallery's "Add Page" button used the legacy [nggallery] shortcode.
 
 = V3.35  - 02.03.2023 =

nextgen-gallery/trunk/composer.lock

@@ -116 +116 @@
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.3",
+            "version": "v4.15.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
+                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
-                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
+                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
                 "shasum": "",
                 "mirrors": [
@@ -172 +172 @@
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
             },
-            "time": "2023-01-16T22:05:37+00:00"
+            "time": "2023-03-05T19:49:14+00:00"
         }
     ],

nextgen-gallery/trunk/nggallery.php

@@ -5 +5 @@
  * Plugin Name: NextGEN Gallery
  * Description: The most popular gallery plugin for WordPress and one of the most popular plugins of all time with over 30 million downloads.
- * Version: 3.35
+ * Version: 3.36
  * Author: Imagely
  * Plugin URI: https://www.imagely.com/wordpress-gallery-plugin/nextgen-gallery/
@@ -684 +684 @@
         define('NGG_MODULE_URL', path_join(str_replace("\\", '/', NGG_PRODUCT_URL), 'photocrati_nextgen/modules'));
         define('NGG_PLUGIN_STARTED_AT', microtime());
-        define('NGG_PLUGIN_VERSION', '3.35');
+        define('NGG_PLUGIN_VERSION', '3.36');
 
         define(

nextgen-gallery/trunk/products/photocrati_nextgen/modules/nextgen_basic_tagcloud/package.module.nextgen_basic_tagcloud.php

@@ -255 +255 @@
         global $wp_query;
         $wp_query_orig = false;
-        if ($wp_query_local != null && $wp_query_local != $wp_query) {
+        if ($wp_query_local !== null && $wp_query_local !== $wp_query) {
             $wp_query_orig = $wp_query;
             $wp_query = $wp_query_local;

nextgen-gallery/trunk/products/photocrati_nextgen/modules/ngglegacy/admin/manage-images.php

@@ -743 +743 @@
             $('.if-js-closed').removeClass('if-js-closed').addClass('closed');
 
-            // Some third party plugins alter when postboxes are enqueued, so give this line a second to wait for it to be available
-            setTimeout(function() {
-                postboxes.add_postbox_toggles('ngg-manage-gallery');
-            }, 1000);
+            // Some third party plugins alter when postboxes are enqueued, so wait for window.postboxes to exist
+            const checkTimer = setInterval(() => {
+                if (typeof window.postboxes !== 'undefined') {
+                    clearInterval(checkTimer);
+                    postboxes.add_postbox_toggles('ngg-manage-gallery');
+                }
+            }, 1000);
 
             $(this).data('ready', true);

nextgen-gallery/trunk/products/photocrati_nextgen/modules/ngglegacy/admin/manage.php

@@ -929 +929 @@
 
             $page['post_type']    = 'page';
-            $page['post_content'] = apply_filters('ngg_add_page_shortcode', '[nggallery id="' . $this->gid . '"]' );
+            $page['post_content'] = apply_filters('ngg_add_page_shortcode', '[ngg src="galleries" display="thumbnails" ids="' . $this->gid . '"]' );
             $page['post_parent']  = $parent_id;
             $page['post_author']  = $user_ID;

nextgen-gallery/trunk/products/photocrati_nextgen/modules/third_party_compat/module.third_party_compat.php

@@ -104 +104 @@
         add_filter('wpseo_sitemap_urlimages', array($this, 'add_wpseo_xml_sitemap_images'), 10, 2);
         add_filter('ngg_pre_delete_unused_term_id', array($this, 'dont_auto_purge_wpml_terms'));
+        add_filter('rank_math/sitemap/urlimages', [$this, 'add_rankmath_seo_images'], 10, 2);
 
         // Nimble Builder needs special consideration because of our shortcode manager's use of placeholders
         add_action('wp_enqueue_scripts', [$this, 'enqueue_nimble_builder_frontend_resources']);
         add_filter('ngg_shortcode_placeholder', [$this, 'nimble_builder_shortcodes'], 10, 4);
+
+        add_filter('wp_sweep_excluded_taxonomies', function($taxonomies) {
+            $taxonomies[] = 'ngg_tag';
+            return $taxonomies;
+        });
 
         if ($this->is_ngg_page())
@@ -128 +134 @@
 
         add_action('the_post', [$this, 'fix_page_parameter']);
+    }
+
+    /**
+     * Adds NextGEN images to RankMath when generating page & post sitemaps
+     *
+     * @param array $images
+     * @param int $post_ID
+     * @return array
+     */
+    public function add_rankmath_seo_images($images, $post_ID)
+    {
+        $post = get_post($post_ID);
+        preg_match_all(
+            '/' . get_shortcode_regex() . '/',
+            $post->post_content,
+            $matches,
+            PREG_SET_ORDER
+        );
+
+        $renderer   = C_Displayed_Gallery_Renderer::get_instance();
+        $storage    = C_Gallery_Storage::get_instance();
+        $shortcodes = C_NextGen_Shortcode_Manager::get_instance()->get_shortcodes();
+        $retval     = [];
+
+        foreach ($matches as $match) {
+            // Only process our shortcodes
+            if (in_array($match[2], $shortcodes))
+                continue;
+            $params = shortcode_parse_atts(trim($match[0], '[]'));
+            if (in_array($params[0], $shortcodes))
+                unset($params[0]);
+
+            $displayed_gallery = $renderer->params_to_displayed_gallery($params);
+            foreach ($displayed_gallery->get_entities() as $entity) {
+                // Do not start following albums' into their descent into madness.
+                if (isset($entity->galdesc))
+                    continue;
+                $retval[] = ['src' => $storage->get_image_url($entity)];
+            };
+        }
+
+        return array_merge($images, $retval);
     }
 

nextgen-gallery/trunk/readme.txt

@@ -3 +3 @@
 Tags: wordpress gallery plugin, gallery, nextgen, nextgen gallery, photo gallery, image gallery, photography, slideshow, images, photo, photo album, watermark
 Requires at least: 5.5.4
-Stable tag: 3.35
-Tested up to: 6.1.1
+Stable tag: 3.36
+Tested up to: 6.2
 License: GPLv3
 Requires PHP: 5.6
@@ -179 +179 @@
 
 == Changelog ==
+
+= V3.36  - 05.10.2023 =
+* NEW:     Added support for WP-Sweep so that NextGEN's tags will not be automatically removed.
+* NEW:     Added NextGEN Gallery images to RankMath SEO's sitemaps.
+* Fixed:   A JS error could trigger on the Manage Gallery page in some circumstances.
+* Fixed:   In some specific situations NextGEN Gallery could cause an infinite loop on all pages.
+* Fixed:   Manage Gallery's "Add Page" button used the legacy [nggallery] shortcode.
 
 = V3.35  - 02.03.2023 =

nextgen-gallery/trunk/vendor/autoload.php

@@ -23 +23 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit004157cb5085dc071ae6f8aa09fb1dbe::getLoader();
+return ComposerAutoloaderInit43fb05fe5a4c2309c48e2d7d895f8844::getLoader();

nextgen-gallery/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit004157cb5085dc071ae6f8aa09fb1dbe
+class ComposerAutoloaderInit43fb05fe5a4c2309c48e2d7d895f8844
 {
     private static $loader;
@@ -25 +25 @@
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit004157cb5085dc071ae6f8aa09fb1dbe', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit43fb05fe5a4c2309c48e2d7d895f8844', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit004157cb5085dc071ae6f8aa09fb1dbe', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit43fb05fe5a4c2309c48e2d7d895f8844', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit004157cb5085dc071ae6f8aa09fb1dbe::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit43fb05fe5a4c2309c48e2d7d895f8844::getInitializer($loader));
 
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit004157cb5085dc071ae6f8aa09fb1dbe::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInit43fb05fe5a4c2309c48e2d7d895f8844::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire004157cb5085dc071ae6f8aa09fb1dbe($fileIdentifier, $file);
+            composerRequire43fb05fe5a4c2309c48e2d7d895f8844($fileIdentifier, $file);
         }
 
@@ -48 +48 @@
  * @return void
  */
-function composerRequire004157cb5085dc071ae6f8aa09fb1dbe($fileIdentifier, $file)
+function composerRequire43fb05fe5a4c2309c48e2d7d895f8844($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

nextgen-gallery/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInit004157cb5085dc071ae6f8aa09fb1dbe
+class ComposerStaticInit43fb05fe5a4c2309c48e2d7d895f8844
 {
     public static $files = array (
@@ -29 +29 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixesPsr0 = ComposerStaticInit004157cb5085dc071ae6f8aa09fb1dbe::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit004157cb5085dc071ae6f8aa09fb1dbe::$classMap;
+            $loader->prefixesPsr0 = ComposerStaticInit43fb05fe5a4c2309c48e2d7d895f8844::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit43fb05fe5a4c2309c48e2d7d895f8844::$classMap;
 
         }, null, ClassLoader::class);