Merge pull request #2504 from kprajapatii/master

2.3.35

assets/aui/js/add-listing.js

@@ -735,7 +735,7 @@ var GeoDir_Business_Hours = {
  * Save all the tinymce editors or if they are in HTML mode it will not save the last changes.
  */
 function geodir_save_all_tinymce_editors() {
-    if (typeof tinymce !== 'undefined' && tinymce.editors.length > 0) {
+    if (typeof tinymce !== 'undefined' && tinymce.editors && tinymce.editors.length > 0) {
         for (var i = 0; i < tinymce.editors.length; i++) {
             // you need to do what is needed here
             // example: write the content back to the form foreach editor instance

assets/js/add-listing.js

@@ -724,7 +724,7 @@ var GeoDir_Business_Hours = {
  * Save all the tinymce editors or if they are in HTML mode it will not save the last changes.
  */
 function geodir_save_all_tinymce_editors() {
-    if (typeof tinymce !== 'undefined' && tinymce.editors.length > 0) {
+    if (typeof tinymce !== 'undefined' && tinymce.editors && tinymce.editors.length > 0) {
         for (var i = 0; i < tinymce.editors.length; i++) {
             // you need to do what is needed here
             // example: write the content back to the form foreach editor instance

includes/deprecated-functions.php

@@ -507,7 +507,7 @@ function geodir_fa_6_5_0_fix_get_option( $value, $option ) {
 
 	return $value;
 }
-add_filter( 'option_wp-font-awesome-settings', 'geodir_fa_6_5_0_fix_get_option', 21, 2 );
+//add_filter( 'option_wp-font-awesome-settings', 'geodir_fa_6_5_0_fix_get_option', 21, 2 );
 
 function geodir_fa_6_5_0_fix_update_option( $value, $old_value, $option ) {
 	if ( ! ( $option == 'wp-font-awesome-settings' && ! empty( $value ) && is_array( $value ) ) ) {
@@ -524,4 +524,4 @@ function geodir_fa_6_5_0_fix_update_option( $value, $old_value, $option ) {
 
 	return $value;
 }
-add_filter( 'pre_update_option_wp-font-awesome-settings', 'geodir_fa_6_5_0_fix_update_option', 21, 3 );
+//add_filter( 'pre_update_option_wp-font-awesome-settings', 'geodir_fa_6_5_0_fix_update_option', 21, 3 );

includes/integrations/bricks/class-geodir-bricks.php

@@ -104,10 +104,10 @@ public static function register_provider( $providers ) {
 	public static function add_template_types( $control_options ) {
 		$template_types = $control_options['templateTypes'];
 
-		$template_types['gd_single'] = 'GD - ' . esc_html__( 'Single', 'bricks' );
-		$template_types['gd_archive'] = 'GD - ' . esc_html__( 'Archive', 'bricks' );
-		//$template_types['gd_archive_item'] = 'GD - ' . esc_html__( 'Archive Item', 'bricks' );
-		$template_types['gd_search'] = 'GD - ' . esc_html__( 'Search Results', 'bricks' );
+		$template_types['gd_single'] = 'GD - ' . esc_html__( 'Single', 'geodirectory' );
+		$template_types['gd_archive'] = 'GD - ' . esc_html__( 'Archive', 'geodirectory' );
+		//$template_types['gd_archive_item'] = 'GD - ' . esc_html__( 'Archive Item', 'geodirectory' );
+		$template_types['gd_search'] = 'GD - ' . esc_html__( 'Search Results', 'geodirectory' );
 
 		$control_options['templateTypes'] = $template_types;
 

includes/widgets/class-geodir-widget-post-features.php

@@ -175,7 +175,7 @@ public function set_arguments() {
 			'type'            => 'notice',
 			'desc'            => __( 'This uses the custom fields output locations.', 'geodirectory' ),
 			'status'          => 'info',
-			'group'           => __( 'Content', 'super-duper' ),
+			'group'           => __( 'Content', 'geodirectory' ),
 			'element_require' => '[%source%]=="meta_auto"',
 		);
 

vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php

@@ -1,5 +1,4 @@
 <?php
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -13,7 +12,7 @@
 	class AyeCode_Connect_Helper {
 
 		// Hold the version number
-		var $version = "1.0.3";
+		var $version = "1.0.4";
 
 		// Hold the default strings.
 		var $strings = array();
@@ -30,24 +29,20 @@ class AyeCode_Connect_Helper {
 		 * @param array $pages
 		 */
 		public function __construct( $strings = array(), $pages = array() ) {
-
 			// Only fire if not localhost and the current user has the right permissions.
 			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
-
-
 				// set default strings
 				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!" ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?" ),
-					'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s" ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site" ),
-					'connecting_button' => __( "Connecting..." ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost." ),
-					'error'             => __( "Something went wrong, please refresh and try again." ),
+					'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
+					'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
+					'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
+					'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
+					'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
+					'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
+					'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
 				);
 				$this->strings   = array_merge( $default_strings, $strings );
 
-
 				// set default pages
 				$default_pages = array();
 				$this->pages   = array_merge( $default_pages, $pages );
@@ -65,7 +60,6 @@ public function __construct( $strings = array(), $pages = array() ) {
 			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
 				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
 			}
-
 		}
 
 		/**
@@ -99,7 +93,6 @@ private function format_plugin_slug( $key ) {
 		 * Install and activate the AyeCode Connect Plugin
 		 */
 		public function ayecode_connect_install() {
-
 			// bail if localhost
 			if ( $this->is_localhost() ) {
 				wp_send_json_error( $this->strings['error_localhost'] );
@@ -302,19 +295,13 @@ public function ayecode_connect_install_notice() {
 					</span>
 					<span class="acch-float-left acch-text">
 						<h3 class="acch-title"><?php echo esc_attr( $connect_title_string ); ?></h3>
-					<p>
-						<?php
-						echo $connect_string;
-						?>
+					<p><?php echo $connect_string; ?>
 					</p>
 					</span>
 
 					<span class="acch-float-left acch-button">
-						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site"
-						        class="button button-primary"
-						        data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
 					</span>
-
 				</div>
 
 				<?php
@@ -361,11 +348,8 @@ class="button button-primary"
 					</span>
 
 					<span class="acch-float-left acch-button">
-						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site"
-						        class="button button-primary"
-						        data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
 					</span>
-
 						</div>
 					</div>
 					<?php
@@ -414,7 +398,6 @@ public function script() {
 				.acch-button {
 					zoom: 1.3;
 				}
-
 			</style>
 			<script>
 				/**
@@ -450,9 +433,7 @@ function ayecode_connect_helper($this) {
 							}
 						}
 					});
-				}
-
-
+				} 
 				<?php
 				// add thickbox if external request is requested
 				if(! empty( $_REQUEST['external-connect-request'] )) {
@@ -465,7 +446,6 @@ function ayecode_connect_helper($this) {
 				<?php
 				}
 				?>
-
 			</script>
 			<?php
 		}
@@ -480,17 +460,13 @@ public function maybe_show() {
 
 			// check if on a page set to show
 			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
-
 				// check if not active and connected
 				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
 					$show = true;
 				}
-
 			}
 
 			return $show;
 		}
-
 	}
-
 }

vendor/ayecode/ayecode-connect-helper/change-log.txt

@@ -1,2 +1,5 @@
+= 1.0.4 - 2023-12-14 =
+* Update textdomain - CHANGED
+
 = 1.0.3 =
 * Added version comparisons so we know if the connect message will show or not - ADDED

vendor/ayecode/wp-ayecode-ui/change-log.txt

@@ -1,3 +1,7 @@
+= 0.2.5 - 2023-12-14 =
+* Update textdomain - CHANGED
+* Inline CSS breaks p element in block editor - FIXED
+
 = 0.2.4 =
 * Last ios fix broke standard image select from library - FIXED