diff --git a/alerts/class-alert-type-menu-alert.php b/alerts/class-alert-type-menu-alert.php index b3950d93e..99032b65f 100644 --- a/alerts/class-alert-type-menu-alert.php +++ b/alerts/class-alert-type-menu-alert.php @@ -141,8 +141,6 @@ public function menu_alert( $wp_admin_bar ) { /** * Get a list of all current alert messages for current user. * - * @todo update this for VIP. (get_user_meta) - * * @return array List of alert messages */ public function get_messages() { diff --git a/classes/class-admin.php b/classes/class-admin.php index 5fc88e583..0a0cbe08a 100644 --- a/classes/class-admin.php +++ b/classes/class-admin.php @@ -1091,10 +1091,6 @@ public function get_users_record_meta( $authors ) { * @return mixed */ public function get_user_meta( $user_id, $meta_key, $single = true ) { - if ( wp_stream_is_vip() && function_exists( 'get_user_attribute' ) ) { - return get_user_attribute( $user_id, $meta_key ); - } - return get_user_meta( $user_id, $meta_key, $single ); } @@ -1109,10 +1105,6 @@ public function get_user_meta( $user_id, $meta_key, $single = true ) { * @return int|bool */ public function update_user_meta( $user_id, $meta_key, $meta_value, $prev_value = '' ) { - if ( wp_stream_is_vip() && function_exists( 'update_user_attribute' ) ) { - return update_user_attribute( $user_id, $meta_key, $meta_value ); - } - return update_user_meta( $user_id, $meta_key, $meta_value, $prev_value ); } @@ -1126,10 +1118,6 @@ public function update_user_meta( $user_id, $meta_key, $meta_value, $prev_value * @return bool */ public function delete_user_meta( $user_id, $meta_key, $meta_value = '' ) { - if ( wp_stream_is_vip() && function_exists( 'delete_user_attribute' ) ) { - return delete_user_attribute( $user_id, $meta_key, $meta_value ); - } - return delete_user_meta( $user_id, $meta_key, $meta_value ); } } diff --git a/classes/class-list-table.php b/classes/class-list-table.php index 6a5d32315..23c8a4f39 100644 --- a/classes/class-list-table.php +++ b/classes/class-list-table.php @@ -151,12 +151,12 @@ public function get_hidden_columns() { } // Directly checking the user meta; to check whether user has changed screen option or not. - $hidden = $this->plugin->admin->get_user_meta( $user->ID, 'manage' . $this->screen->id . 'columnshidden', true ); + $hidden = get_user_meta( $user->ID, 'manage' . $this->screen->id . 'columnshidden', true ); // If user meta is not found; add the default hidden column 'id'. if ( ! $hidden ) { $hidden = array( 'id' ); - $this->plugin->admin->update_user_meta( $user->ID, 'manage' . $this->screen->id . 'columnshidden', $hidden ); + update_user_meta( $user->ID, 'manage' . $this->screen->id . 'columnshidden', $hidden ); } return $hidden; @@ -1139,7 +1139,7 @@ public function screen_controls( $status, $args ) { if ( 'on' === $option && 'false' === $heartbeat ) { $option = 'off'; - $this->plugin->admin->update_user_meta( $user_id, $this->plugin->admin->live_update->user_meta_key, 'off' ); + update_user_meta( $user_id, $this->plugin->admin->live_update->user_meta_key, 'off' ); } $nonce = wp_create_nonce( $this->plugin->admin->live_update->user_meta_key . '_nonce' ); diff --git a/classes/class-live-update.php b/classes/class-live-update.php index 220288bc7..f20d0baaf 100644 --- a/classes/class-live-update.php +++ b/classes/class-live-update.php @@ -72,14 +72,14 @@ public function enable_live_update() { $user = (int) $input['user']; if ( 'false' === $input['heartbeat'] ) { - $this->plugin->admin->update_user_meta( $user, $this->user_meta_key, 'off' ); + update_user_meta( $user, $this->user_meta_key, 'off' ); wp_send_json_error( esc_html__( "Live updates could not be enabled because Heartbeat is not loaded.\n\nYour hosting provider or another plugin may have disabled it for performance reasons.", 'stream' ) ); return; } - $success = $this->plugin->admin->update_user_meta( $user, $this->user_meta_key, $checked ); + $success = update_user_meta( $user, $this->user_meta_key, $checked ); if ( $success ) { wp_send_json_success( ( 'on' === $checked ) ? 'Live Updates enabled' : 'Live Updates disabled' ); @@ -183,7 +183,7 @@ public function heartbeat_received( $response, $data ) { return $response; } - $enable_stream_update = ( 'off' !== $this->plugin->admin->get_user_meta( get_current_user_id(), $this->user_meta_key ) ); + $enable_stream_update = ( 'off' !== get_user_meta( get_current_user_id(), $this->user_meta_key ) ); // Register list table. $this->list_table = new List_Table(