Merge branch '7567' into shakib-latest-master

Author: shuvo7670

includes/API/Settings.php

@@ -216,15 +216,28 @@ public function wpsp_instant_social_share( $data )
         do_action('wpsp_instant_social_single_profile_share', $data->get_params());
     }
 
-     // Fetch option table data
     public function wpsp_get_options_data( $request ) {
         $option_value = get_option('wpsp_settings_v5');
+        
         if ($option_value !== false) {
+            $option_value = json_decode($option_value, true);
+            // Check and process `linkedin_profile_list` if it exists
+            if (isset($option_value['linkedin_profile_list']) && is_array($option_value['linkedin_profile_list'])) {
+                $option_value['linkedin_profile_list'] = array_map(function($profile) {
+                    if (isset($profile['__id']) && isset($profile['id'])) {
+                        $profile['id'] = $profile['__id'];
+                        unset($profile['__id']);
+                    }
+                    return $profile;
+                }, $option_value['linkedin_profile_list']);
+            }
+            $option_value = json_encode($option_value);
             return rest_ensure_response($option_value);
         } else {
             return new \WP_Error('option_not_found', 'Option not found', array('status' => 40));
         }
     }
+    
 
     /**
      * Return an instance of this class.

includes/Social/InstantShare.php

@@ -555,7 +555,14 @@ public function instant_social_single_profile_share($params)
             }
         } else if ($platform == 'linkedin') {
             $linkedin = \WPSP\Helper::get_social_profile(WPSCP_LINKEDIN_OPTION_NAME);
-            $platformKey = !empty( $profileID ) ? array_search($profileID, array_column($linkedin, 'id')) : intval($platformKey);
+            if (($platformKey = array_search($profileID, array_column($linkedin, '__id'))) !== false) {
+                $platformKey = intval($platformKey);
+            } elseif (($platformKey = array_search($profileID, array_column($linkedin, 'id'))) !== false) {
+                $platformKey = intval($platformKey);
+            } else {
+                $platformKey = null; // Or any default value
+            }
+            
             // if disable account then it will be off
             if ($linkedin[$platformKey]->status == false) {
                 wp_die();

includes/Social/Linkedin.php

@@ -161,7 +161,7 @@ public function remote_post($post_id, $profile_key, $force_share = false)
         $get_share_type =   get_post_meta($post_id, '_linkedin_share_type', true);
         if( $profile->type !== 'organization' && $get_share_type === 'custom' ) {
             $get_all_selected_profile     = get_post_meta($post_id, '_selected_social_profile', true);
-            $check_profile_exists         = Helper::is_profile_exits( $profile->id, $get_all_selected_profile );
+            $check_profile_exists         = Helper::is_profile_exits( isset( $profile->__id ) ? $profile->__id : $profile->id , $get_all_selected_profile );
             if( !$check_profile_exists ) {
                 return;
             }

includes/Social/SocialProfile.php

@@ -491,6 +491,7 @@ public function social_profile_fetch_user_info_and_token()
                 }
                 $pages = apply_filters('wpsp_filter_linkedin_pages', $pages, $profiles);
                 $info = array(
+                    '__id'          => time(),
                     'app_id'        => $app_id,
                     'app_secret'    => $app_secret,
                     'status'        => true,