more cherry picking

Author: ilicfilip

classes/admin/class-page-settings.php

@@ -138,17 +138,14 @@ public function set_page_values( $pages ) {
 	}
 
 	/**
-	 * Save the settings.
+	 * Save the redirect on login setting.
+	 *
+	 * @param bool $redirect_on_login Whether to redirect on login.
 	 *
 	 * @return void
 	 */
-	public function save_settings() {
-		// Nonce is already checked in store_settings_form_options() which calls this method.
-		$redirect_on_login = isset( $_POST['prpl-redirect-on-login'] ) // phpcs:ignore WordPress.Security.NonceVerification.Missing
-			? \sanitize_text_field( \wp_unslash( $_POST['prpl-redirect-on-login'] ) ) // phpcs:ignore WordPress.Security.NonceVerification.Missing
-			: false;
-
-		\update_user_meta( \get_current_user_id(), 'prpl_redirect_on_login', (bool) $redirect_on_login );
+	public function save_redirect_on_login( $redirect_on_login = false ) {
+		\update_user_meta( \get_current_user_id(), 'prpl_redirect_on_login', $redirect_on_login );
 	}
 
 	/**

classes/ui/class-chart.php

@@ -109,8 +109,9 @@ public function get_chart_data( $args = [] ) {
 		 */
 		$previous_period_activities = [];
 		if ( $args['normalized'] ) {
-			$previous_month_start       = ( clone $periods[0]['start_date'] )->modify( '-1 month' );
-			$previous_month_end         = ( clone $periods[0]['start_date'] )->modify( '-1 day' );
+			$first_period_start         = $periods[0]['start_date'];
+			$previous_month_start       = ( clone $first_period_start )->modify( '-1 month' );
+			$previous_month_end         = ( clone $first_period_start )->modify( '-1 day' );
 			$previous_period_activities = $args['items_callback']( $previous_month_start, $previous_month_end );
 			if ( $args['filter_results'] ) {
 				$activities = $args['filter_results']( $activities );

classes/utils/class-date.php

@@ -68,8 +68,15 @@ public function get_periods( $start_date, $end_date, $frequency ) {
 		if ( empty( $date_ranges ) ) {
 			return [];
 		}
-		if ( $end_date->format( 'z' ) !== \end( $date_ranges )['end_date']->format( 'z' ) ) {
-			$final_end     = clone \end( $date_ranges )['end_date'];
+		$last_range = \end( $date_ranges );
+		/**
+		 * The end date of the last range.
+		 *
+		 * @var \DateTime $last_end_date
+		 */
+		$last_end_date = $last_range['end_date'];
+		if ( $end_date->format( 'z' ) !== $last_end_date->format( 'z' ) ) {
+			$final_end     = clone $last_end_date;
 			$date_ranges[] = $this->get_range( $final_end->modify( '+1 day' ), $end_date );
 		}