Changeset 3102188

Timestamp:

06/13/2024 09:18:14 AM (8 weeks ago)

Author:

rafiq91

Message:

Update to version 7.10.2 from GitHub

Location:

directorist

Files:

• tags/7.10.2 (copied) (copied from directorist/trunk)
• tags/7.10.2/config.php (modified) (1 diff)
• tags/7.10.2/directorist-base.php (modified) (1 diff)
• tags/7.10.2/includes/classes/class-extension.php (modified) (2 diffs)
• tags/7.10.2/includes/model/Listings.php (modified) (2 diffs)
• tags/7.10.2/readme.txt (modified) (3 diffs)
• trunk/config.php (modified) (1 diff)
• trunk/directorist-base.php (modified) (1 diff)
• trunk/includes/classes/class-extension.php (modified) (2 diffs)
• trunk/includes/model/Listings.php (modified) (2 diffs)
• trunk/readme.txt (modified) (3 diffs)

directorist/tags/7.10.2/config.php

@@ -1 +1 @@
 <?php
 // Plugin version.
-if ( ! defined( 'ATBDP_VERSION' ) ) {define( 'ATBDP_VERSION', '7.10.1' );}
+if ( ! defined( 'ATBDP_VERSION' ) ) {define( 'ATBDP_VERSION', '7.10.' );}
 // Plugin Folder Path.
 if ( ! defined( 'ATBDP_DIR' ) ) { define( 'ATBDP_DIR', plugin_dir_path( __FILE__ ) ); }

directorist/tags/7.10.2/directorist-base.php

@@ -4 +4 @@
  * Plugin URI: https://wpwax.com
  * Description: A comprehensive solution to create professional looking directory site of any kind. Like Yelp, Foursquare, etc.
- * Version: 7.10.1
+ * Version: 7.10.
  * Author: wpWax
  * Author URI: https://wpwax.com

directorist/tags/7.10.2/includes/classes/class-extension.php

@@ -395 +395 @@
                 $plugin_key  = self::filter_plugin_key_from_base_name( $plugin_key );
                 $plugin_item = self::extract_plugin_from_list( $plugin_key, $plugins_available_in_subscriptions );
-                $url         = self::get_file_download_link( $plugin_item, 'plugin' );
-
-                $download_status = $this->download_plugin( array( 'url' => $url ) );
+                $url ;
+                
+                $download_status = $this->download_plugin( array( 'url' => $ ) );
 
                 if ( ! $download_status['success'] ) {
@@ -649 +649 @@
 
                 $theme_item = $themes_available_in_subscriptions[ $theme_stylesheet ];
-                $url        = self::get_file_download_link( $theme_item, 'theme' );
-                $url        = ( empty( $url ) && ! empty( $outdated_themes[ $theme_stylesheet ]['package'] ) ) ? $outdated_themes[ $theme_stylesheet ]['package'] : $url;
-
+                $url = $theme_item['download_link'] ?? '';
                 $download_status = $this->download_theme( array( 'url' => $url ) );
 

directorist/tags/7.10.2/includes/model/Listings.php

@@ -1197 +1197 @@
 
         if ( $this->directory_type ) {
-            $args['slug'] = $this->directory_type;
+            $args['slug']    = $this->directory_type;
+            $args['orderby'] = 'slug__in';
         }
 
@@ -1204 +1205 @@
 
     public function get_current_listing_type() {
+
+
         if ( is_singular( ATBDP_POST_TYPE ) ) {
             $directory = get_post_meta( get_the_ID(), '_directory_type', true );
         } else if ( ! empty( $_REQUEST['directory_type'] ) ) {
             $directory = sanitize_text_field( wp_unslash( $_REQUEST['directory_type'] ) );
-    
-            if ( ! is_numeric( $directory ) ) {
-                $directory_term = get_term_by( 'slug', $directory, ATBDP_DIRECTORY_TYPE );
-                $directory      = $directory_term ? $directory_term->term_id : 0;
-            }
-        }
-    
-        if ( ! empty( $directory ) && directorist_is_directory( $directory ) ) {
+        } else if ( ! empty( $this->default_directory_type ) ) {
+            $directory = $this->default_directory_type;
+        } else if ( ! empty( $this->directory_type ) ) {
+            $directory = array_key_first( $this->get_listing_types() );
+        }
+
+        if ( ! is_numeric( $directory ) ) {
+            $directory_term = get_term_by( 'slug', $directory, ATBDP_DIRECTORY_TYPE );
+            $directory      = $directory_term ? $directory_term->term_id : 0;
+        }
+
+        if ( directorist_is_directory( $directory ) ) {
             return (int) $directory;
         }
-        
+
         return directorist_get_default_directory();
     }

directorist/tags/7.10.2/readme.txt

@@ -1 @@
-=== Directorist - WordPress Business Directory Plugin with Classified Ads Listings ===
+=== Directorist - WordPress Business Directory Plugin with Classified Ads Listings ===
 Contributors: wpwax
 Donate link: https://directorist.com/extensions/
@@ -6 +6 @@
 Tested up to: 6.5
 Requires PHP: 7.0
-Stable tag: 7.10.1
+Stable tag: 7.10.
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -305 +305 @@
 == Changelog ==
 
+
+
+
+
 7.10.0 - Jun 9, 2024
 

directorist/trunk/config.php

@@ -1 +1 @@
 <?php
 // Plugin version.
-if ( ! defined( 'ATBDP_VERSION' ) ) {define( 'ATBDP_VERSION', '7.10.1' );}
+if ( ! defined( 'ATBDP_VERSION' ) ) {define( 'ATBDP_VERSION', '7.10.' );}
 // Plugin Folder Path.
 if ( ! defined( 'ATBDP_DIR' ) ) { define( 'ATBDP_DIR', plugin_dir_path( __FILE__ ) ); }

directorist/trunk/directorist-base.php

@@ -4 +4 @@
  * Plugin URI: https://wpwax.com
  * Description: A comprehensive solution to create professional looking directory site of any kind. Like Yelp, Foursquare, etc.
- * Version: 7.10.1
+ * Version: 7.10.
  * Author: wpWax
  * Author URI: https://wpwax.com

directorist/trunk/includes/classes/class-extension.php

@@ -395 +395 @@
                 $plugin_key  = self::filter_plugin_key_from_base_name( $plugin_key );
                 $plugin_item = self::extract_plugin_from_list( $plugin_key, $plugins_available_in_subscriptions );
-                $url         = self::get_file_download_link( $plugin_item, 'plugin' );
-
-                $download_status = $this->download_plugin( array( 'url' => $url ) );
+                $url ;
+                
+                $download_status = $this->download_plugin( array( 'url' => $ ) );
 
                 if ( ! $download_status['success'] ) {
@@ -649 +649 @@
 
                 $theme_item = $themes_available_in_subscriptions[ $theme_stylesheet ];
-                $url        = self::get_file_download_link( $theme_item, 'theme' );
-                $url        = ( empty( $url ) && ! empty( $outdated_themes[ $theme_stylesheet ]['package'] ) ) ? $outdated_themes[ $theme_stylesheet ]['package'] : $url;
-
+                $url = $theme_item['download_link'] ?? '';
                 $download_status = $this->download_theme( array( 'url' => $url ) );
 

directorist/trunk/includes/model/Listings.php

@@ -1197 +1197 @@
 
         if ( $this->directory_type ) {
-            $args['slug'] = $this->directory_type;
+            $args['slug']    = $this->directory_type;
+            $args['orderby'] = 'slug__in';
         }
 
@@ -1204 +1205 @@
 
     public function get_current_listing_type() {
+
+
         if ( is_singular( ATBDP_POST_TYPE ) ) {
             $directory = get_post_meta( get_the_ID(), '_directory_type', true );
         } else if ( ! empty( $_REQUEST['directory_type'] ) ) {
             $directory = sanitize_text_field( wp_unslash( $_REQUEST['directory_type'] ) );
-    
-            if ( ! is_numeric( $directory ) ) {
-                $directory_term = get_term_by( 'slug', $directory, ATBDP_DIRECTORY_TYPE );
-                $directory      = $directory_term ? $directory_term->term_id : 0;
-            }
-        }
-    
-        if ( ! empty( $directory ) && directorist_is_directory( $directory ) ) {
+        } else if ( ! empty( $this->default_directory_type ) ) {
+            $directory = $this->default_directory_type;
+        } else if ( ! empty( $this->directory_type ) ) {
+            $directory = array_key_first( $this->get_listing_types() );
+        }
+
+        if ( ! is_numeric( $directory ) ) {
+            $directory_term = get_term_by( 'slug', $directory, ATBDP_DIRECTORY_TYPE );
+            $directory      = $directory_term ? $directory_term->term_id : 0;
+        }
+
+        if ( directorist_is_directory( $directory ) ) {
             return (int) $directory;
         }
-        
+
         return directorist_get_default_directory();
     }

directorist/trunk/readme.txt

@@ -1 @@
-=== Directorist - WordPress Business Directory Plugin with Classified Ads Listings ===
+=== Directorist - WordPress Business Directory Plugin with Classified Ads Listings ===
 Contributors: wpwax
 Donate link: https://directorist.com/extensions/
@@ -6 +6 @@
 Tested up to: 6.5
 Requires PHP: 7.0
-Stable tag: 7.10.1
+Stable tag: 7.10.
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -305 +305 @@
 == Changelog ==
 
+
+
+
+
 7.10.0 - Jun 9, 2024