Skip to content

General: fix PHP notices that may pop up with PHP 7.4. #14192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeherve merged 1 commit into from
Dec 9, 2019
Merged

General: fix PHP notices that may pop up with PHP 7.4. #14192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions _inc/lib/admin-pages/class.jetpack-react-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,20 @@ function get_flattened_settings( $modules ) {
* @return array
*/
function jetpack_current_user_data() {
$current_user = wp_get_current_user();
$current_user = wp_get_current_user();
$is_master_user = $current_user->ID == Jetpack_Options::get_option( 'master_user' );
$dotcom_data = Jetpack::get_connected_user_data();

// Add connected user gravatar to the returned dotcom_data.
$dotcom_data['avatar'] = get_avatar_url( $dotcom_data['email'], array( 'size' => 64, 'default' => 'mysteryman' ) );
$dotcom_data['avatar'] = ( ! empty( $dotcom_data['email'] ) ?
get_avatar_url(
$dotcom_data['email'],
array(
'size' => 64,
'default' => 'mysteryman',
)
)
: false );

$current_user_data = array(
'isConnected' => Jetpack::is_user_connected( $current_user->ID ),
Expand Down
6 changes: 4 additions & 2 deletions src/class-tracking.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ public function jetpack_user_authorized() {
}

$connection_manager = new Connection_Manager();
$wpcom_user_data = $connection_manager->get_connected_user_data( $user_id );
update_user_meta( $user_id, 'jetpack_tracks_wpcom_id', $wpcom_user_data['ID'] );
$wpcom_user_data = $connection_manager->get_connected_user_data( $user_id );
if ( isset( $wpcom_user_data['ID'] ) ) {
update_user_meta( $user_id, 'jetpack_tracks_wpcom_id', $wpcom_user_data['ID'] );
}

$this->tracking->record_user_event( 'wpa_user_linked', array() );
}
Expand Down