2.0.0.47

AyeCode · Mar 5, 2019 · 41392dc · 41392dc
1 parent a2af718
commit 41392dc
Show file tree

Hide file tree

Showing 14 changed files with 121 additions and 7,349 deletions.
diff --git a/assets/css/admin.css b/assets/css/admin.css
diff --git a/assets/css/admin.css.map b/assets/css/admin.css.map
diff --git a/assets/css/block_editor.css b/assets/css/block_editor.css
diff --git a/assets/css/block_editor.css.map b/assets/css/block_editor.css.map
diff --git a/assets/css/style.css b/assets/css/style.css
diff --git a/assets/css/style.css.map b/assets/css/style.css.map
diff --git a/change_log.txt b/change_log.txt
@@ -1,7 +1,8 @@
 v2.0.0.47
-Edit post permalink button missing so permalink can't be edited - FIXED
+Edit post permalink button missing so not able to edit single permalink - FIXED
 Radio button and text overlap on add listing page - FIXED
 Twitter feed custom field no longer working - FIXED
+Latest compatibility settings caused issue with some builders - FIXED
 
 v2.0.0.46
 Some custom fields should store is_default = 0 during v1 to v2 conversion - FIXED

diff --git a/geodirectory.php b/geodirectory.php
@@ -11,7 +11,7 @@
  * Plugin Name: GeoDirectory
  * Plugin URI: https://wpgeodirectory.com/
  * Description: GeoDirectory plugin for WordPress.
- * Version: 2.0.0.46
+ * Version: 2.0.0.47
  * Author: AyeCode Ltd
  * Author URI: https://wpgeodirectory.com
  * Text Domain: geodirectory
@@ -60,7 +60,7 @@ final class GeoDirectory {
      *
      * @var string
      */
-    public $version = '2.0.0.46';
+    public $version = '2.0.0.47';
 
     /**
      * GeoDirectory instance.

diff --git a/includes/class-geodir-compatibility.php b/includes/class-geodir-compatibility.php
@@ -208,18 +208,93 @@ public static function dynamically_add_post_meta( $metadata, $object_id, $meta_k
 
 		// An array or meta keys we don't want to be used by the template pages
 		// @todo switch back to an inclusive array, exclusive can add to many queries
-		$restricted_meta_keys = array(
-			'',
+//		$restricted_meta_keys = array(
+//			'',
+//		);
+//
+//		if ( $meta_key && $meta_key[0]== "_" && geodir_is_page( 'single' )) {
+//			if ( $object_id && $metadata == '' && ! in_array( $meta_key, $restricted_meta_keys ) && $object_id == get_queried_object_id() ) {
+//				$metadata = geodir_get_post_meta_raw( geodir_details_page_id(), $meta_key );
+//			}
+//		}elseif($meta_key && $meta_key[0]== "_" && geodir_is_page( 'archive' ) ){
+//			if ( $object_id && $metadata == '' && ! in_array( $meta_key, $restricted_meta_keys ) && $object_id == get_queried_object_id() ) {
+//				$metadata = geodir_get_post_meta_raw( geodir_archive_page_id(), $meta_key );
+//			}
+//		}
+
+		// new way
+
+		// Standard WP fields
+		$wp_keys = array(
+			'_wp_page_template',
+//			'_thumbnail_id',
 		);
 
-		if ( $meta_key && $meta_key[0]== "_" && geodir_is_page( 'single' )) {
-			if ( $object_id && $metadata == '' && ! in_array( $meta_key, $restricted_meta_keys ) && $object_id == get_queried_object_id() ) {
-				$metadata = geodir_get_post_meta_raw( geodir_details_page_id(), $meta_key );
+		// Generic keys
+		$gen_keys = array(
+			'primer_layout', // primer theme layout
+		);
+
+		// FusionBuilder (Avada theme), we need to add these on the fly
+		if(class_exists( 'FusionBuilder' )){
+
+			if(substr( $meta_key, 0, 5 ) === "pyre_" || substr( $meta_key, 0, 4 ) === "sbg_"){
+				$gen_keys[] = $meta_key;
+			}
+		}
+
+
+
+		// Beaver builder :: it does not seem to need any changes
+
+		if(
+			$meta_key
+			&& ($meta_key[0]== "_" || in_array($meta_key,$gen_keys))
+			&& $object_id
+			&& $object_id == get_queried_object_id()
+			&& (geodir_is_page( 'single' ) || geodir_is_page( 'archive' ))
+		){
+			$template_page_id = geodir_is_page( 'single' ) ? geodir_details_page_id() : geodir_archive_page_id();
+
+			// WP
+			if(in_array($meta_key,$wp_keys)){
+				$metadata = geodir_get_post_meta_raw( $template_page_id, $meta_key );
 			}
-		}elseif($meta_key && $meta_key[0]== "_" && geodir_is_page( 'archive' ) ){
-			if ( $object_id && $metadata == '' && ! in_array( $meta_key, $restricted_meta_keys ) && $object_id == get_queried_object_id() ) {
-				$metadata = geodir_get_post_meta_raw( geodir_archive_page_id(), $meta_key );
+
+			// generic keys
+			if(in_array($meta_key,$gen_keys)){
+				$metadata = geodir_get_post_meta_raw( $template_page_id, $meta_key );
 			}
+
+			// Elementor
+			if(function_exists( '_is_elementor_installed' ) && geodir_get_post_meta_raw( $template_page_id, '_elementor_edit_mode')=='builder'){
+				if(substr( $meta_key, 0, 11 ) === "_elementor_"){
+					$metadata = geodir_get_post_meta_raw( $template_page_id, $meta_key );
+				}
+			}
+
+			// DIVI (elegant themes)
+			if(function_exists('et_pb_is_pagebuilder_used') && et_pb_is_pagebuilder_used($template_page_id)){
+				if(substr( $meta_key, 0, 4 ) === "_et_"){
+					$metadata = geodir_get_post_meta_raw( $template_page_id, $meta_key );
+				}
+			}
+
+			// Beaver Builder
+			if(class_exists( 'FLBuilderLoader' ) && geodir_get_post_meta_raw( $template_page_id, '_fl_builder_enabled') ){
+				if(substr( $meta_key, 0, 4 ) === "_fl_"){
+					$metadata = geodir_get_post_meta_raw( $template_page_id, $meta_key );
+				}
+			}
+
+			// WPBakery page builder
+//			if(class_exists( 'FLBuilderLoader' ) && geodir_get_post_meta_raw( $template_page_id, '_fl_builder_enabled') ){
+//				if(substr( $meta_key, 0, 4 ) === "_vc_"){
+//					$metadata = geodir_get_post_meta_raw( $template_page_id, $meta_key );
+//				}
+//			}
+
+
 		}
 
 		return $metadata;

diff --git a/includes/widgets/class-geodir-widget-post-images.php b/includes/widgets/class-geodir-widget-post-images.php
@@ -223,6 +223,7 @@ public function output($args = array(), $widget_args = array(),$content = ''){
 	 */
 	public function output_images($options){
 		global $post,$gd_slider_outputs,$gd_post;
+		if(!isset($post->ID)){return '';}
 		ob_start();
 
 		// options

diff --git a/includes/widgets/class-geodir-widget-single-tabs.php b/includes/widgets/class-geodir-widget-single-tabs.php
@@ -72,7 +72,7 @@ public function __construct() {
      */
     public function output($args = array(), $widget_args = array(),$content = ''){
         global $preview, $post,$gd_post;
-
+        if(!isset($post->ID)){return '';}
         // options
         $defaults = array(
             'show_as_list' => '0', // 0 =  all

diff --git a/languages/geodirectory-en_US.mo b/languages/geodirectory-en_US.mo
diff --git a/languages/geodirectory-en_US.po b/languages/geodirectory-en_US.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: GeoDirectory 2.0.0.46\n"
+"Project-Id-Version: GeoDirectory 2.0.0.47\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-04 15:42+0000\n"
-"PO-Revision-Date: 2019-03-04 15:42+0000\n"
+"POT-Creation-Date: 2019-03-05 19:09+0000\n"
+"PO-Revision-Date: 2019-03-05 19:09+0000\n"
 "Last-Translator: \n"
 "Language-Team: AyeCode Ltd <[email protected]>\n"
 "Language: en_US\n"
@@ -8277,21 +8277,21 @@ msgid ""
 "href=\"%s\">Edit page</a>"
 msgstr ""
 
-#: includes/class-geodir-compatibility.php:376
+#: includes/class-geodir-compatibility.php:456
 msgid "Yoast SEO detected"
 msgstr ""
 
-#: includes/class-geodir-compatibility.php:378
+#: includes/class-geodir-compatibility.php:458
 msgid ""
 "The Yoast SEO plugin has been detected and will take over the GeoDirectory "
 "Settings unless disabled below."
 msgstr ""
 
-#: includes/class-geodir-compatibility.php:383
+#: includes/class-geodir-compatibility.php:463
 msgid "Disable Yoast"
 msgstr ""
 
-#: includes/class-geodir-compatibility.php:384
+#: includes/class-geodir-compatibility.php:464
 msgid "Disable overwrite by Yoast SEO titles & metas on GD pages?"
 msgstr ""
 
@@ -9800,6 +9800,11 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: includes/custom-fields/output-filter-functions.php:40
+#, php-format
+msgid "Tweets by %s"
+msgstr ""
+
 #: includes/custom-fields/output-functions.php:720
 msgid "Some demo text."
 msgstr ""

diff --git a/readme.txt b/readme.txt
@@ -7,7 +7,7 @@ Tags:  directory plugin, business directory, listings, classifieds, real estate
 Requires at least: 4.5
 Requires PHP: 5.3
 Tested up to: 5.1
-Stable tag: 2.0.0.46
+Stable tag: 2.0.0.47
 
 
 Create huge location-based business directories with this fully-featured directory plugin. In a few clicks you could be the next Yelp or Tripadvisor.