Merge branch 'release/1.8.8' into hotfix/give_currency_symbol

includes/actions.php

@@ -104,7 +104,7 @@ function give_connect_donor_to_wpuser( $user_id, $user_data ){
 			// Update user_id meta in payments.
 			if( ! empty( $donor->payment_ids ) && ( $donations = explode( ',', $donor->payment_ids ) ) ) {
 				foreach ( $donations as $donation  ) {
-					update_post_meta( $donation, '_give_payment_user_id', $user_id );
+					give_update_meta( $donation, '_give_payment_user_id', $user_id );
 				}
 			}
 		}

includes/admin/forms/class-metabox-form-data.php

@@ -802,7 +802,7 @@ public function save( $post_id, $post ) {
 							case 'textarea':
 							case 'wysiwyg':
 								$form_meta_value = wp_kses_post( $_POST[ $form_meta_key ] );
-								update_post_meta( $post_id, $form_meta_key, $form_meta_value );
+								give_update_meta( $post_id, $form_meta_key, $form_meta_value );
 								break;
 
 							case 'group':
@@ -837,14 +837,14 @@ public function save( $post_id, $post ) {
 								$form_meta_value = array_values( $form_meta_value );
 
 								// Save data.
-								update_post_meta( $post_id, $form_meta_key, $form_meta_value );
+								give_update_meta( $post_id, $form_meta_key, $form_meta_value );
 								break;
 
 							default:
 								$form_meta_value = give_clean( $_POST[ $form_meta_key ] );
 
 								// Save data.
-								update_post_meta( $post_id, $form_meta_key, $form_meta_value );
+								give_update_meta( $post_id, $form_meta_key, $form_meta_value );
 						}
 
 						// Fire after saving form meta key.

includes/admin/forms/dashboard-columns.php

@@ -85,7 +85,7 @@ function give_render_form_columns( $column_name, $post_id ) {
 				}
 				break;
 			case 'goal':
-				if ( give_is_setting_enabled( get_post_meta( $post_id, '_give_goal_option', true ) ) ) {
+				if ( give_is_setting_enabled( give_get_meta( $post_id, '_give_goal_option', true ) ) ) {
 					echo give_goal( $post_id, false );
 				} else {
 					esc_html_e( 'No Goal Set', 'give' );
@@ -309,7 +309,7 @@ function give_price_save_quick_edit( $post_id ) {
 	}
 
 	if ( isset( $_REQUEST['_give_regprice'] ) ) {
-		update_post_meta( $post_id, '_give_set_price', strip_tags( stripslashes( $_REQUEST['_give_regprice'] ) ) );
+		give_update_meta( $post_id, '_give_set_price', strip_tags( stripslashes( $_REQUEST['_give_regprice'] ) ) );
 	}
 }
 
@@ -334,7 +334,7 @@ function give_save_bulk_edit() {
 			}
 
 			if ( ! empty( $price ) ) {
-				update_post_meta( $post_id, '_give_set_price', give_sanitize_amount( $price ) );
+				give_update_meta( $post_id, '_give_set_price', give_sanitize_amount( $price ) );
 			}
 		}
 	}

includes/admin/give-metabox-functions.php

@@ -727,7 +727,7 @@ function give_get_field_value( $field, $postid ) {
 	}
 
 	// Get value from db.
-	$field_value = get_post_meta( $postid, $field['id'], true );
+	$field_value = give_get_meta( $postid, $field['id'], true );
 
 	/**
 	 * Filter the field value before apply default value.
@@ -758,8 +758,18 @@ function give_get_field_value( $field, $postid ) {
  */
 function give_get_field_description( $field ) {
 	$field_desc_html = '';
-	if ( ! empty( $field['description'] ) ) {
-		$field_desc_html = '<span class="give-field-description">' . wp_kses_post( $field['description'] ) . '</span>';
+	$description     = '';
+
+	// Check for both `description` and `desc`.
+	if ( isset( $field['description'] ) ) {
+		$description = $field['description'];
+	} elseif ( isset( $field['desc'] ) ) {
+		$description = $field['desc'];
+	}
+
+	// Set if there is a description.
+	if ( ! empty( $description ) ) {
+		$field_desc_html = '<span class="give-field-description">' . wp_kses_post( $description ) . '</span>';
 	}
 
 	return $field_desc_html;
@@ -926,7 +936,7 @@ function _give_metabox_form_data_repeater_fields( $fields ) {
 
 		<table class="give-repeatable-fields-section-wrapper" cellspacing="0">
 			<?php
-			$repeater_field_values = get_post_meta( $thepostid, $fields['id'], true );
+			$repeater_field_values = give_get_meta( $thepostid, $fields['id'], true );
 			$header_title          = isset( $fields['options']['header_title'] )
 				? $fields['options']['header_title']
 				: esc_attr__( 'Group', 'give' );
@@ -1143,10 +1153,10 @@ function give_get_current_setting_page() {
  * @return string
  */
 function _give_display_content_field_value( $field_value, $field, $postid ) {
-	$show_content = get_post_meta( $postid, '_give_content_option', true );
+	$show_content = give_get_meta( $postid, '_give_content_option', true );
 
 	if (
-		! get_post_meta( $postid, '_give_display_content', true )
+		! give_get_meta( $postid, '_give_display_content', true )
 		&& $show_content
 		&& ( 'none' !== $show_content )
 	) {
@@ -1174,10 +1184,10 @@ function _give_display_content_field_value( $field_value, $field, $postid ) {
  * @return string
  */
 function _give_content_placement_field_value( $field_value, $field, $postid ) {
-	$show_content = get_post_meta( $postid, '_give_content_option', true );
+	$show_content = give_get_meta( $postid, '_give_content_option', true );
 
 	if (
-		! get_post_meta( $postid, '_give_content_placement', true )
+		! give_get_meta( $postid, '_give_content_placement', true )
 		&& ( 'none' !== $show_content )
 	) {
 		$field_value = $show_content;
@@ -1203,7 +1213,7 @@ function _give_content_placement_field_value( $field_value, $field, $postid ) {
  * @return string
  */
 function _give_terms_option_field_value( $field_value, $field, $postid ) {
-	$term_option = get_post_meta( $postid, '_give_terms_option', true );
+	$term_option = give_get_meta( $postid, '_give_terms_option', true );
 
 	if ( in_array( $term_option, array( 'none', 'yes' ) ) ) {
 		$field_value = ( 'yes' === $term_option ? 'enabled' : 'disabled' );
@@ -1230,7 +1240,7 @@ function _give_terms_option_field_value( $field_value, $field, $postid ) {
  * @return string
  */
 function _give_offline_donation_enable_billing_fields_single_field_value( $field_value, $field, $postid ) {
-	$offline_donation = get_post_meta( $postid, '_give_offline_donation_enable_billing_fields_single', true );
+	$offline_donation = give_get_meta( $postid, '_give_offline_donation_enable_billing_fields_single', true );
 
 	if ( 'on' === $offline_donation ) {
 		$field_value = 'enabled';
@@ -1256,7 +1266,7 @@ function _give_offline_donation_enable_billing_fields_single_field_value( $field
  * @return string
  */
 function _give_custom_amount_field_value( $field_value, $field, $postid ) {
-	$custom_amount = get_post_meta( $postid, '_give_custom_amount', true );
+	$custom_amount = give_get_meta( $postid, '_give_custom_amount', true );
 
 	if ( in_array( $custom_amount, array( 'yes', 'no' ) ) ) {
 		$field_value = ( 'yes' === $custom_amount ? 'enabled' : 'disabled' );
@@ -1282,7 +1292,7 @@ function _give_custom_amount_field_value( $field_value, $field, $postid ) {
  * @return string
  */
 function _give_goal_option_field_value( $field_value, $field, $postid ) {
-	$goal_option = get_post_meta( $postid, '_give_goal_option', true );
+	$goal_option = give_get_meta( $postid, '_give_goal_option', true );
 
 	if ( in_array( $goal_option, array( 'yes', 'no' ) ) ) {
 		$field_value = ( 'yes' === $goal_option ? 'enabled' : 'disabled' );
@@ -1308,7 +1318,7 @@ function _give_goal_option_field_value( $field_value, $field, $postid ) {
  * @return string
  */
 function _give_close_form_when_goal_achieved_value( $field_value, $field, $postid ) {
-	$close_form = get_post_meta( $postid, '_give_close_form_when_goal_achieved', true );
+	$close_form = give_get_meta( $postid, '_give_close_form_when_goal_achieved', true );
 
 	if ( in_array( $close_form, array( 'yes', 'no' ) ) ) {
 		$field_value = ( 'yes' === $close_form ? 'enabled' : 'disabled' );
@@ -1334,7 +1344,7 @@ function _give_close_form_when_goal_achieved_value( $field_value, $field, $posti
  * @return string
  */
 function _give_logged_in_only_value( $field_value, $field, $postid ) {
-	$guest_donation = get_post_meta( $postid, '_give_logged_in_only', true );
+	$guest_donation = give_get_meta( $postid, '_give_logged_in_only', true );
 
 	if ( in_array( $guest_donation, array( 'yes', 'no' ) ) ) {
 		$field_value = ( 'yes' === $guest_donation ? 'enabled' : 'disabled' );
@@ -1360,7 +1370,7 @@ function _give_logged_in_only_value( $field_value, $field, $postid ) {
  * @return string
  */
 function _give_customize_offline_donations_value( $field_value, $field, $postid ) {
-	$customize_offline_text = get_post_meta( $postid, '_give_customize_offline_donations', true );
+	$customize_offline_text = give_get_meta( $postid, '_give_customize_offline_donations', true );
 
 	if ( in_array( $customize_offline_text, array( 'yes', 'no' ) ) ) {
 		$field_value = ( 'yes' === $customize_offline_text ? 'enabled' : 'disabled' );

includes/admin/payments/class-payments-table.php

@@ -348,6 +348,11 @@ public function column_default( $payment, $column_name ) {
 			case 'amount' :
 				$amount = ! empty( $payment->total ) ? $payment->total : 0;
 				$value  = give_currency_filter( give_format_amount( $amount ), give_get_payment_currency_code( $payment->ID ) );
+				$value  .= sprintf(
+					'<br><small>%1$s %2$s</small>',
+					__( 'Via', 'give' ),
+					give_get_gateway_admin_label( $payment->gateway )
+				);
 				break;
 
 			case 'donation_form' :

includes/admin/payments/view-order-details.php

@@ -413,7 +413,7 @@
 										<div class="column">
 											<p>
 												<strong><?php esc_html_e( 'Total Donation:', 'give' ); ?></strong><br>
-												<?php echo esc_html( give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) ) ); ?>
+												<?php echo esc_html( give_currency_filter( give_format_amount( $payment->total ), give_get_payment_currency_code( $payment->ID ) )  ); ?>
 											</p>
 											<p>
 												<?php

includes/admin/reporting/class-api-requests-logs-list-table.php

@@ -142,9 +142,9 @@ public function column_details( $item ) {
 				echo '<div>' . esc_html( $error ) . '</div>';
 			}
 			echo '<p><strong>' . esc_html__( 'API User:', 'give' ) . '</strong></p>';
-			echo '<div>' . get_post_meta( $item['ID'], '_give_log_user', true ) . '</div>';
+			echo '<div>' . give_get_meta( $item['ID'], '_give_log_user', true ) . '</div>';
 			echo '<p><strong>' . esc_html__( 'API Key:', 'give' ) . '</strong></p>';
-			echo '<div>' . get_post_meta( $item['ID'], '_give_log_key', true ) . '</div>';
+			echo '<div>' . give_get_meta( $item['ID'], '_give_log_key', true ) . '</div>';
 			echo '<p><strong>' . esc_html__( 'Request Date:', 'give' ) . '</strong></p>';
 			echo '<div>' . get_post_field( 'post_date', $item['ID'] ) . '</div>';
 			?>
@@ -300,7 +300,7 @@ public function get_logs() {
 
 				$logs_data[] = array(
 					'ID'   => $log->ID,
-					'ip'   => get_post_meta( $log->ID, '_give_log_request_ip', true ),
+					'ip'   => give_get_meta( $log->ID, '_give_log_request_ip', true ),
 					'date' => $log->post_date,
 				);
 			}

includes/admin/reporting/class-sales-logs-list-table.php

@@ -346,7 +346,7 @@ public function get_logs() {
 
 			if ( $logs ) {
 				foreach ( $logs as $log ) {
-					$payment_id = get_post_meta( $log->ID, '_give_log_payment_id', true );
+					$payment_id = give_get_meta( $log->ID, '_give_log_payment_id', true );
 
 					// Make sure this payment hasn't been deleted
 					if ( get_post( $payment_id ) ) :

includes/admin/reporting/export/class-batch-export-customers.php

@@ -193,7 +193,7 @@ public function get_data() {
 
 			if ( $logs ) {
 				foreach ( $logs as $log ) {
-					$payment_id = get_post_meta( $log->ID, '_give_log_payment_id', true );
+					$payment_id = give_get_meta( $log->ID, '_give_log_payment_id', true );
 					$payment    = new Give_Payment( $payment_id );
 
 					// Continue if donor already included.

includes/admin/reporting/export/class-batch-export-forms.php

@@ -142,7 +142,7 @@ public function get_data() {
 
 							default :
 
-								$row[ $key ] = get_post_meta( $download->ID, $key, true );
+								$row[ $key ] = give_get_meta( $download->ID, $key, true );
 
 								break;
 

includes/admin/reporting/export/class-batch-export-payments.php

@@ -169,7 +169,7 @@ public function get_data() {
 					'form_name' => isset( $payment_meta['form_title'] ) ? $payment_meta['form_title'] : '',
 					'skus'      => $skus,
 					'amount'    => html_entity_decode( give_format_amount( $total ) ),
-					'gateway'   => give_get_gateway_admin_label( get_post_meta( $payment->ID, '_give_payment_gateway', true ) ),
+					'gateway'   => give_get_gateway_admin_label( give_get_meta( $payment->ID, '_give_payment_gateway', true ) ),
 					'trans_id'  => give_get_payment_transaction_id( $payment->ID ),
 					'key'       => $payment_meta['key'],
 					'date'      => $payment->post_date,

includes/admin/reporting/tools/class-give-tools-recount-all-stats.php

@@ -147,8 +147,8 @@ public function get_data() {
 		}
 
 		foreach ( $totals as $key => $stats ) {
-			update_post_meta( $key, '_give_form_sales', $stats['sales'] );
-			update_post_meta( $key, '_give_form_earnings', $stats['earnings'] );
+			give_update_meta( $key, '_give_form_sales', $stats['sales'] );
+			give_update_meta( $key, '_give_form_earnings', $stats['earnings'] );
 		}
 
 		return false;

includes/admin/reporting/tools/class-give-tools-recount-form-stats.php

@@ -127,8 +127,8 @@ public function get_data() {
 		}
 
 
-		update_post_meta( $this->form_id, '_give_form_sales', $totals['sales'] );
-		update_post_meta( $this->form_id, '_give_form_earnings', $totals['earnings'] );
+		give_update_meta( $this->form_id, '_give_form_sales', $totals['sales'] );
+		give_update_meta( $this->form_id, '_give_form_earnings', $totals['earnings'] );
 
 		return false;
 

includes/admin/upgrades/upgrade-functions.php

@@ -716,32 +716,32 @@ function give_v18_upgrades_form_metadata() {
 			// Form content.
 			// Note in version 1.8 display content setting split into display content and content placement setting.
 			// You can delete _give_content_option in future
-			$show_content = get_post_meta( get_the_ID(), '_give_content_option', true );
-			if ( $show_content && ! get_post_meta( get_the_ID(), '_give_display_content', true ) ) {
+			$show_content = give_get_meta( get_the_ID(), '_give_content_option', true );
+			if ( $show_content && ! give_get_meta( get_the_ID(), '_give_display_content', true ) ) {
 				$field_value = ( 'none' !== $show_content ? 'enabled' : 'disabled' );
-				update_post_meta( get_the_ID(), '_give_display_content', $field_value );
+				give_update_meta( get_the_ID(), '_give_display_content', $field_value );
 
 				$field_value = ( 'none' !== $show_content ? $show_content : 'give_pre_form' );
-				update_post_meta( get_the_ID(), '_give_content_placement', $field_value );
+				give_update_meta( get_the_ID(), '_give_content_placement', $field_value );
 			}
 
 			// "Disable" Guest Donation. Checkbox
 			// See: https://github.com/WordImpress/Give/issues/1470
-			$guest_donation = get_post_meta( get_the_ID(), '_give_logged_in_only', true );
+			$guest_donation = give_get_meta( get_the_ID(), '_give_logged_in_only', true );
 			$guest_donation_newval = ( in_array( $guest_donation, array( 'yes', 'on' ) ) ? 'disabled' : 'enabled' );
-			update_post_meta( get_the_ID(), '_give_logged_in_only', $guest_donation_newval );
+			give_update_meta( get_the_ID(), '_give_logged_in_only', $guest_donation_newval );
 
 			// Offline Donations
 			// See: https://github.com/WordImpress/Give/issues/1579
-			$offline_donation = get_post_meta( get_the_ID(), '_give_customize_offline_donations', true );
+			$offline_donation = give_get_meta( get_the_ID(), '_give_customize_offline_donations', true );
 			if ( 'no' === $offline_donation ) {
 				$offline_donation_newval = 'global';
 			} elseif ( 'yes' === $offline_donation ) {
 				$offline_donation_newval = 'enabled';
 			} else {
 				$offline_donation_newval = 'disabled';
 			}
-			update_post_meta( get_the_ID(), '_give_customize_offline_donations', $offline_donation_newval );
+			give_update_meta( get_the_ID(), '_give_customize_offline_donations', $offline_donation_newval );
 
 			// Convert yes/no setting field to enabled/disabled.
 			$form_radio_settings = array(
@@ -763,13 +763,13 @@ function give_v18_upgrades_form_metadata() {
 
 			foreach ( $form_radio_settings as $meta_key ) {
 				// Get value.
-				$field_value = get_post_meta( get_the_ID(), $meta_key, true );
+				$field_value = give_get_meta( get_the_ID(), $meta_key, true );
 
 				// Convert meta value only if it is in yes/no/none.
 				if ( in_array( $field_value, array( 'yes', 'on', 'no', 'none' ) ) ) {
 
 					$field_value = ( in_array( $field_value, array( 'yes', 'on' ) ) ? 'enabled' : 'disabled' );
-					update_post_meta( get_the_ID(), $meta_key, $field_value );
+					give_update_meta( get_the_ID(), $meta_key, $field_value );
 				}
 			}
 		}// End while().

includes/api/class-give-api.php

@@ -1005,7 +1005,7 @@ private function get_form_data( $form_info ) {
 		$form['info']['modified_date'] = $form_info->post_modified;
 		$form['info']['status']        = $form_info->post_status;
 		$form['info']['link']          = html_entity_decode( $form_info->guid );
-		$form['info']['content']       = get_post_meta( $form_info->ID, '_give_form_content', true );
+		$form['info']['content']       = give_get_meta( $form_info->ID, '_give_form_content', true );
 		$form['info']['thumbnail']     = wp_get_attachment_url( get_post_thumbnail_id( $form_info->ID ) );
 
 		if ( give_is_setting_enabled( give_get_option( 'categories', 'disabled' ) ) ) {