two buttons working

GlotPress · Sep 3, 2017 · 1f04caf · 1f04caf
1 parent fddfd95
commit 1f04caf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/gp-includes/routes/translation.php b/gp-includes/routes/translation.php
@@ -566,7 +566,7 @@ public function set_feedback( $project_path, $locale_slug, $translation_set_slug
 		$translation_id = gp_post( 'translation_id' );
 		$feedback = gp_post( 'feedback' );
 
-		if ( ! $this->verify_nonce( 'add-feedback_' . $translation_id ) || ! $this->verify_nonce( 'update-feedbacks_' . $translation_id ) ) {
+		if ( ! $this->verify_nonce( 'add-feedback_' . $translation_id ) && ! $this->verify_nonce( 'update-feedbacks_' . $translation_id ) ) {
 			return $this->die_with_error( __( 'An error has occurred. Please try again.', 'glotpress' ), 403 );
 		}
 

diff --git a/gp-includes/things/feedback.php b/gp-includes/things/feedback.php
@@ -30,19 +30,24 @@ function save_feedback( $feedback, $translation ) {
 			return false;
 		}
 		if ( GP::$permission->current_user_can( 'admin', 'feedbacks', $translation->id ) ) {
-			$saved_feedback = esc_html( gp_post( 'all_feedbacks' ) );
+			$saved_feedback = esc_html( gp_post( 'update_feedback' ) );
 		}
                 if( empty( $saved_feedback ) ) {
 			$saved_feedback = $this->get_feedback( $translation );
 			$saved_feedback = $saved_feedback[ 'feedback' ];
 		}
+		error_log($saved_feedback);
 
 		$current_date = $translation->now_in_mysql_format();
 		$current_user = wp_get_current_user();
 		$current_user = $current_user->data->display_name;
 
-		if ( ! empty( $saved_feedback ) && ! empty( $feedback ) ) {
-			$feedback = $current_user . ' @ ' . $current_date . ' added:' . "\n" . $feedback . "\n" . $saved_feedback;
+		if ( ! empty( $saved_feedback ) ) {
+                        if (! empty( $feedback )) {
+                                $feedback = $current_user . ' @ ' . $current_date . ' added:' . "\n" . $feedback . "\n" . $saved_feedback;
+                        } else {
+                                $feedback = $saved_feedback;
+                        }
 			return $translation->query( "UPDATE $wpdb->gp_feedbacks SET feedback = '%s', user_id = '%s', date_added = '%s' WHERE (original_id = '%s' AND translation_set_id = '%s')", $feedback, get_current_user_id(), $current_date, $translation->original_id, $translation->translation_set_id
 			);
 		} else {