uypd

Author: rayhanuddin2019

class-plugin.php

@@ -570,15 +570,7 @@ public static function get_widget_style() {
 			'countdown'          => array(
 				'handler' => 'wcf--countdown',
 				'src'     => 'widgets/countdown.min.css',
-<<<<<<< HEAD
-<<<<<<< HEAD
-				'dep'     => array( 'wcf-addons-core' ),
-=======
-				'dep'     => [],
->>>>>>> cbe273f5e8d98e77474f37520e56e4629e40dc13
-=======
-				'dep'     => array( 'wcf-addons-core' ),
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
+				'dep'     => array( 'wcf-addons-core' ),			
 				'version' => false,
 				'media'   => 'all',
 			),
@@ -750,30 +742,15 @@ public static function get_widget_style() {
 				'dep'     => array(),
 				'version' => false,
 				'media'   => 'all',
-<<<<<<< HEAD
-<<<<<<< HEAD
-			),
-		);
-=======
-			],
-			'post-comment' => [
-=======
-            ),
+			),				
 			'post-comment' => array(
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
 				'handler' => 'wcf--post-comment',
 				'src'     => 'widgets/post-comment.min.css',
 				'dep'     => [],
 				'version' => false,
-				'media'   => 'all',
-<<<<<<< HEAD
-			],
-		];
->>>>>>> cbe273f5e8d98e77474f37520e56e4629e40dc13
-=======
-            ),
+				'media'   => 'all',	
+		    ),
         );
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
 	}
 
 	/**

inc/CodeSnippet/CodeSnippetFrontend.php

@@ -63,10 +63,6 @@ public static function instance() {
 	private function init_hooks() {
 		// Use 'wp' so conditional tags (is_singular, is_archive, etc.) are available.
 		$this->run_php_code_snippets();
-<<<<<<< HEAD
-		// add_action( 'wp', array( $this, 'run_php_code_snippets' ) );
-=======
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
 		add_action( 'wp_head', array( $this, 'execute_head_snippets' ), 1 );
 		add_action( 'wp_footer', array( $this, 'execute_footer_snippets' ), 999 );
 		add_action( 'wp_body_open', array( $this, 'execute_body_start_snippets' ), 1 );
@@ -91,11 +87,7 @@ public function run_php_code_snippets() {
 		$snippets = $this->get_active_snippets( 'php' );
 
 		foreach ( $snippets as $snippet ) {
-<<<<<<< HEAD
-			$snippet_data = $this->get_code_snippet_settings( $snippet->ID );
-=======
 			$snippet_data = $this->aae_get_code_snippet_settings( $snippet->ID );
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
 			if ( $this->check_visibility_conditions( $snippet_data ) ) {
 				$this->execute_snippet( $snippet_data );
 			}

inc/hook.php

@@ -6,20 +6,6 @@
 
 use Elementor\Plugin;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-if ( function_exists( 'wcf_set_postview' ) ) {
-	add_action( 'wp_head', 'wcf_set_postview' );
-}
-
-function aaeaddonlight_hk_allow_svg_uploads( $mimes ) {
-	// Allow SVG files
-	$mimes['svg']  = 'image/svg+xml';
-	$mimes['svgz'] = 'image/svg+xml'; // Compressed SVG
-	return $mimes;
-=======
-=======
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
 if (function_exists('wcf_set_postview')) {
     add_action('wp_head', 'wcf_set_postview');
 }
@@ -30,63 +16,10 @@ function aaeaddonlight_hk_allow_svg_uploads($mimes)
     $mimes['svg']  = 'image/svg+xml';
     $mimes['svgz'] = 'image/svg+xml'; // Compressed SVG
     return $mimes;
-<<<<<<< HEAD
->>>>>>> cbe273f5e8d98e77474f37520e56e4629e40dc13
-}
-
-add_filter( 'upload_mimes', 'aaeaddonlight_hk_allow_svg_uploads' );
-
-<<<<<<< HEAD
-function aae_handle_aae_post_shares_count() {
-	if ( ! isset( $_POST['nonce'] ) ) {
-		exit( 'No naughty business please . Provide Security Code' );
-	}
-	$nonce = sanitize_text_field( wp_unslash( $_POST['nonce'] ) );
-	if ( ! wp_verify_nonce( $nonce, 'wcf-addons-frontend' ) ) {
-		exit( 'No naughty business please' );
-	}
-
-	if ( isset( $_POST['post_id'] ) && isset( $_POST['social'] ) ) {
-		$post_id = intval( sanitize_text_field( wp_unslash( $_POST['post_id'] ) ) );
-		$social  = sanitize_text_field( wp_unslash( $_POST['social'] ) );
-
-		// Retrieve current share count, increment it, or set it if it doesn't exist
-		$current_shares = get_post_meta( $post_id, 'aae_post_shares', true );
-		if ( ! is_array( $current_shares ) ) {
-			$current_shares = array();
-		}
-		if ( isset( $current_shares[ $social ] ) ) {
-			++$current_shares[ $social ];
-		} else {
-			$current_shares[ $social ] = 1;
-		}
-
-		$shares_count = array_sum( array_values( $current_shares ) );
-
-		foreach ( $current_shares as $k => $single ) {
-			update_post_meta( $post_id, 'aae_post_shares_' . $k, $single );
-		}
-
-		update_post_meta( $post_id, 'aae_post_shares_count', $shares_count );
-		update_post_meta( $post_id, 'aae_post_shares', $current_shares );
-
-		// Return updated share count as a response
-		wp_send_json_success(
-			array(
-				'share_count' => $shares_count,
-				'post_shares' => $current_shares,
-			)
-		);
-	} else {
-		wp_send_json_error( 'Invalid post ID' );
-	}
-=======
-=======
 }
 
 add_filter('upload_mimes', 'aaeaddonlight_hk_allow_svg_uploads');
 
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
 function aae_handle_aae_post_shares_count()
 {
     if (!isset($_POST['nonce'])) {
@@ -129,35 +62,10 @@ function aae_handle_aae_post_shares_count()
     } else {
         wp_send_json_error('Invalid post ID');
     }
-<<<<<<< HEAD
->>>>>>> cbe273f5e8d98e77474f37520e56e4629e40dc13
-=======
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
 }
 add_action('wp_ajax_aae_post_shares', 'aae_handle_aae_post_shares_count'); // For logged-in users
 add_action('wp_ajax_nopriv_aae_post_shares', 'aae_handle_aae_post_shares_count'); // For non-logged-in users
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-function aaeaddon_disable_comments_for_custom_post_type() {
-	remove_post_type_support( 'wcf-addons-template', 'comments' );
-}
-add_action( 'init', 'aaeaddon_disable_comments_for_custom_post_type', 100 );
-
-function aaeaddon_custom_hide_admin_notices_for_specific_page() {
-	$screen = get_current_screen();
-	// ist of admin pages where you want to disable notices
-	$pages_to_hide_notices = array(
-		'wcf-custom-fonts',
-		'wcf-custom-icons',
-		'animation-addon_page_wcf-cpt-builder',
-		'edit-wcf-addons-template',
-		'animation-addon_page_wcf_addons_settings',
-		'animation-addon_page_wcf_addons_setup_page',
-	);
-=======
-=======
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
 function aaeaddon_disable_comments_for_custom_post_type()
 {
     remove_post_type_support('wcf-addons-template', 'comments');
@@ -176,20 +84,6 @@ function aaeaddon_custom_hide_admin_notices_for_specific_page()
         'animation-addon_page_wcf_addons_settings',
         'animation-addon_page_wcf_addons_setup_page'
     );
-<<<<<<< HEAD
->>>>>>> cbe273f5e8d98e77474f37520e56e4629e40dc13
-
-	// Check if current screen ID matches any in the list
-	if ( in_array( $screen->id, $pages_to_hide_notices ) ) {
-		// Remove core and plugin notices
-		remove_all_actions( 'admin_notices' );
-		remove_all_actions( 'all_admin_notices' );
-	}
-}
-<<<<<<< HEAD
-add_action( 'admin_head', 'aaeaddon_custom_hide_admin_notices_for_specific_page' );
-=======
-=======
 
     // Check if current screen ID matches any in the list
     if (in_array($screen->id, $pages_to_hide_notices)) {
@@ -198,7 +92,6 @@ function aaeaddon_custom_hide_admin_notices_for_specific_page()
         remove_all_actions('all_admin_notices');
     }
 }
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
 add_action('admin_head', 'aaeaddon_custom_hide_admin_notices_for_specific_page');
 // post reaction ajax handeler
 
@@ -246,8 +139,4 @@ function aaeaddon_post_lite_reaction_ajax()
     }
     add_action('wp_ajax_nopriv_aaeaddon_post_reaction', 'aaeaddon_post_lite_reaction_ajax');
     add_action('wp_ajax_aaeaddon_post_reaction', 'aaeaddon_post_lite_reaction_ajax');
-}
-<<<<<<< HEAD
->>>>>>> cbe273f5e8d98e77474f37520e56e4629e40dc13
-=======
->>>>>>> f9817d0874edf7712899710f99a4485851af5a59
+}