From c3ec974c7d82506e45bd5ffd71bd21b340fb4b21 Mon Sep 17 00:00:00 2001
From: donaldG <don.gaines2@gmail.com>
Date: Tue, 8 Aug 2017 09:42:02 -0500
Subject: [PATCH] make sure code is up to date w/ WP repo version

---
 media-credit.php |  6 +++---
 readme.txt       | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/media-credit.php b/media-credit.php
index 77b76b2..f266e30 100644
--- a/media-credit.php
+++ b/media-credit.php
@@ -2,7 +2,7 @@
 /*
   Plugin Name: Advanced Custom Fields Media Credit
   Description: This plugin adds Credit & Credit Link fields to the media uploading and editing tool and inserts this credit when the images appear on your blog.
-  Version: 2.3.4
+  Version: 2.3.6
   Author: Don Gaines
   Author URI: http://www.dongaines.com
 */
@@ -111,7 +111,7 @@ function the_media_credit_html( $attachment_id ) {
 			endwhile;
 			$image_credit .= '</span>';
 			//Filter to change the output of <span><span>credit</span> | <span>credit</span></span>
-			$image_credit = apply_filters( 'acf_media_credit_base_output', $image_credit );
+			$image_credit = apply_filters( 'acf_media_credit_base_output_html_credit', $image_credit );
 		endif;
 		return $image_credit;
 	}
@@ -171,7 +171,7 @@ function the_plain_media_credit( $attachment_id ) {
 
 			$image_credit .= '</span>';
 			//Filter to change the output of <span><span>credit</span> | <span>credit</span></span>
-			$image_credit = apply_filters( 'acf_media_credit_base_output', $image_credit );
+			$image_credit = apply_filters( 'acf_media_credit_base_output_plain_credit', $image_credit );
 
 		endif;
 
diff --git a/readme.txt b/readme.txt
index 8748137..081d0ff 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=LNaVZ85r
 Tags: custom, field, custom field, advanced, repeater, media, image, images, credit, byline, author
 Requires at least: 4.0
 Tested up to: 4.7.3
-Stable tag: 2.3.4
+Stable tag: 2.3.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -39,7 +39,7 @@ Yes! There's a filter, `acf_media_credit_base_output` you can use for this purpo
 Most likely, I'm a pretty nice dude. If you have a question feel free to log it in the support section or contact me through my site at http://dongaines.com
 
 == Upgrade Notice ==
-=2.3.4=
+=2.3.6=
 Current
 
 == Screenshots ==
@@ -49,6 +49,12 @@ Current
 
 
 == Changelog ==
+= 2.3.6 =
+* Changing filter names so we are able to separate out how markup changes might be applied.
+
+= 2.3.5 =
+* Merging PR from Github, fixes php notice about undefined var $image_credit, indentation inconsistencies, and removes unused $total var
+
 = 2.3.4 =
 * Oops! Missed a closing tag on that wrapper_tag filter, bit of a hot fix.