Merge pull request #32 from mundschenk-at/misc

Clean-up for release of 3.2.0

.jshintignore

@@ -1,5 +1,4 @@
 **/js/**.min.js
-admin/js/tinymce4/tinymce-noneditable.js
 node_modules/**/*.js
 build/**/*.js
 vendor/**/*.js

.scrutinizer.yml

@@ -28,9 +28,6 @@ build:
         neo4j: false
         php:
             version: 7.1
-    tests:
-        override:
-            - phpcs-run -p media-credit.php includes/ admin/ public/ --extensions=php
     nodes:
         analysis:
             project_setup:
@@ -39,7 +36,9 @@ build:
                 before:
                     - composer require --dev johnpbloch/wordpress
             tests:
-                override: [php-scrutinizer-run]
+                override:
+                    - php-scrutinizer-run
+                    - phpcs-run -p media-credit.php includes/ admin/ public/ --extensions=php
 tools:
     php_code_sniffer: false
     php_cs_fixer: false

CHANGELOG.md

@@ -1,3 +1,10 @@
+= 3.2.0 (Feb. 21, 2018) =
+*   Use minified stylesheets and JavaScript files if running in a production environment.
+*   "Display credit after posts" now works with pages as well as regular posts (and custom post types).
+*   "Include schema.org structured data" can switched off again after first being enabled.
+*   General code clean-up.
+*   TinyMCE components updated.
+
 = 3.1.7 (Feb. 24, 2017) =
 *   JavaScript components should be slightly more fault tolerant now.
 *   The plugin does not depend on the visual editor being enabled anymore. Props

Gruntfile.js

@@ -42,6 +42,7 @@ module.exports = function( grunt ) {
 		wp_deploy: {
 			options: {
 				plugin_slug: 'media-credit',
+				svn_url: "https://plugins.svn.wordpress.org/{plugin-slug}/",
 				// svn_user: 'your-wp-repo-username',
 				build_dir: 'build', //relative path to your build directory
 				assets_dir: 'wp-assets', //relative path to your assets directory (optional).
@@ -76,7 +77,7 @@ module.exports = function( grunt ) {
 			],
 			options: {
 				reporter: require('jshint-stylish'),
-				expr: true,
+				jshintrc: true,
 				globals: {
 					jQuery: true,
 					console: true,

README.md

@@ -3,35 +3,22 @@
 **Tags:** media, image, images, credit, byline, author, user  
 **Requires at least:** 4.9  
 **Tested up to:** 4.9  
-**Stable tag:** 3.1.7  
+**Stable tag:** 3.2.0  
 
-Adds a "Credit" field when uploading media to posts and displays it under the images
-on your blog to properly credit the artist.
+Adds a "Credit" field when uploading media to posts and displays it under the images on your blog to properly credit the artist.
 
 
 ## Description ##
 
-Feel free to get in touch with us about anything you'd like me to add to this plugin
-or any feedback. We love hearing from our users!
-[Start a thread on the plugin forum](https://wordpress.org/support/plugin/media-credit/#postform)
-and we'll get back to you shortly!
+Feel free to get in touch with us about anything you'd like me to add to this plugin or any feedback. We love hearing from our users! [Start a thread on the plugin forum](https://wordpress.org/support/plugin/media-credit/#postform) and we'll get back to you shortly!
 
-This plugin adds a "Credit" field when uploading media to posts and displays it
-under the images on your blog to properly credit the artist.
+This plugin adds a "Credit" field when uploading media to posts and displays it under the images on your blog to properly credit the artist.
 
-When adding media through the Media Uploader tool or editing media already in the
-Media Library, this plugin adds a new field to the media form that allows users
-to assign credit for given media to a user of your blog (assisted with autocomplete)
-or to any freeform text (e.g. courtesy photos, etc.).
+When adding media through the Media Uploader tool or editing media already in the Media Library, this plugin adds a new field to the media form that allows users to assign credit for given media to a user of your blog (assisted with autocomplete) or to any freeform text (e.g. courtesy photos, etc.).
 
-When this media is then inserted into a post, a new shortcode, `[media-credit]`,
-surrounds the media, inside of any caption, with the provided media credit information.
-Media credit inside this shortcode is then displayed on your blog under your media
-with the class `.media-credit`, which has some default styling but which you can
-customize to your heart's content.
+When this media is then inserted into a post, a new shortcode, `[media-credit]`, surrounds the media, inside of any caption, with the provided media credit information. Media credit inside this shortcode is then displayed on your blog under your media with the class `.media-credit`, which has some default styling but which you can customize to your heart's content.
 
-You can also display all the media by an author on the author's page. See more in
-the [FAQ](https://wordpress.org/plugins/media-credit/faq/).
+You can also display all the media by an author on the author's page. See more in the [FAQ](https://wordpress.org/plugins/media-credit/faq/).
 
 
 ## Frequently Asked Questions ##
@@ -50,44 +37,25 @@ if ( !array_key_exists( 'media-credit', $shortcode_tags ) )
 	add_shortcode('media-credit', 'ignore_media_credit_shortcode' );
 ?>`
 
-Also, I'd really appreciate it if you gave us
-[some feedback](https://wordpress.org/support/plugin/media-credit/#postform) as
-to why you disabled the plugin and how it could have better suited your needs.
+Also, I'd really appreciate it if you gave us [some feedback](https://wordpress.org/support/plugin/media-credit/#postform) as to why you disabled the plugin and how it could have better suited your needs.
 
 ### Can I display all or recent media credited to a given author? ###
 
-Indeed, just call the template tag `<?php display_author_media($author_id); ?>`
-in your theme's author.php (or elsewhere, if you want). The template tag has optional
-parameters if you want to customize the CSS or text. The default options will display
-thumbnails of the 10 most recent media items credited to the given user floated
-to the right with a width of `150px` and a header of `<h3>Recent Media</h3>`.
-
-These options can be changed with a more verbose call to the function:
-`<?php display_author_media($author_id, $sidebar = true, $limit = 10, $link_without_parent = false, $header = "<h3>Recent Media</h3>", $exclude_unattached = true); ?>`. This will make only the 10 most recent media items
-that are attached to a post display with the given header taking up the maximum width
-it's afforded. Each image will link to the post in which it appears, or the attachment
-page if it has no parent post (unless `$link_without_parent` is set to `false`).
-If you don't care about whether the media is attached to a post, change `$exclude_unattached`
-to `false`. This function as a whole will only display media uploaded and credited
-to a user after this plugin was installed.
+Indeed, just call the template tag `<?php display_author_media($author_id); ?>` in your theme's author.php (or elsewhere, if you want). The template tag has optional parameters if you want to customize the CSS or text. The default options will display thumbnails of the 10 most recent media items credited to the given user floated to the right with a width of `150px` and a header of `<h3>Recent Media</h3>`.
+
+These options can be changed with a more verbose call to the function: `<?php display_author_media($author_id, $sidebar = true, $limit = 10, $link_without_parent = false, $header = "<h3>Recent Media</h3>", $exclude_unattached = true); ?>`. This will make only the 10 most recent media items that are attached to a post display with the given header taking up the maximum width it's afforded. Each image will link to the post in which it appears, or the attachment page if it has no parent post (unless `$link_without_parent` is set to `false`). If you don't care about whether the media is attached to a post, change `$exclude_unattached` to `false`. This function as a whole will only display media uploaded and credited to a user after this plugin was installed.
 
 ### More generally, can I insert media credit information into my themes with a template tag, for instance on category pages? ###
 
-I'm so glad you asked; you certainly can! Just call `<?php get_media_credit_html($post); ?>`
-with an attachment id (`int`) or `WP_Post` object for an attachment to get the media
-credit, including a link to the author page. To echo the results, call `<?php the_media_credit_html($post); ?>`.
+I'm so glad you asked; you certainly can! Just call `<?php get_media_credit_html($post); ?>` with an attachment id (`int`) or `WP_Post` object for an attachment to get the media credit, including a link to the author page. To echo the results, call `<?php the_media_credit_html($post); ?>`.
 
 ### Is there a template tag that just gives plain text rather than a link to the author page for users of my blog? ###
 
-Yep! If you would prefer plain-text rather than a link for all media credit (and
-leaving out the separator and organization), call `<?php get_media_credit($post); ?>`
-which uses the same parameter as above. To echo the results, call `<?php the_media_credit($post); ?>`.
+Yep! If you would prefer plain-text rather than a link for all media credit (and leaving out the separator and organization), call `<?php get_media_credit($post); ?>` which uses the same parameter as above. To echo the results, call `<?php the_media_credit($post); ?>`.
 
 ### Can I link to an artist inside a media credit field? ###
 
-You sure can. Just add the link attribute in the media-credit shortcode, found in
-HTML view for a post, or directly when adding an image. For example, if your post
-contains:
+You sure can. Just add the link attribute in the media-credit shortcode, found in HTML view for a post, or directly when adding an image. For example, if your post contains:
 
 `[media-credit name="Artist" align="alignleft" width="300"]<img src="http://www.mysite.com/files/2010/09/image.jpg" width="300" height="450" class="size-300 wp-image-2" />[/media-credit]`
 
@@ -99,15 +67,11 @@ Note the link to `www.artistwebsite.com` above.
 
 ### Why do I get unparsed [media-credit] shortcodes in my Facebook/Twitter/... previews with JetPack Publicize? ###
 
-Unfortunately, this is a known bug in JetPack that can only be fixed by Automattic.
-As a workaround, use a different plugin for posting to social networks. Alternatively,
-if you make sure that you haven't got any images with credits within the first 55
-words of your article, you should be fine, too.
+Unfortunately, this is a known bug in JetPack that can only be fixed by Automattic. As a workaround, use a different plugin for posting to social networks. Alternatively, if you make sure that you haven't got any images with credits within the first 55 words of your article, you should be fine, too.
 
 ### Your question was not answered in the FAQ? ###
 
-Feel free to get in touch with us about anything you'd like us to add to this list
-by <strong>leaving a message in the Wordpress.org [support forums here](https://wordpress.org/support/plugin/media-credit/#postform).</strong>
+Feel free to get in touch with us about anything you'd like us to add to this list by <strong>leaving a message in the Wordpress.org [support forums here](https://wordpress.org/support/plugin/media-credit/#postform).</strong>
 
 ## Screenshots ##
 
@@ -127,28 +91,25 @@ by <strong>leaving a message in the Wordpress.org [support forums here](https://
 
 ## Changelog ##
 
-### 3.2.0 (Feb. xx, 2018) ###
+### 3.2.0 (Feb. 21, 2018) ###
+*   Use minified stylesheets and JavaScript files if running in a production environment.
 *   "Display credit after posts" now works with pages as well as regular posts (and custom post types).
-*
+*   "Include schema.org structured data" can switched off again after first being enabled.
+*   General code clean-up.
+*   TinyMCE components updated.
 
 ### 3.1.7 (Feb. 24, 2017) ###
 *   JavaScript components should be slightly more fault tolerant now.
-*   The plugin does not depend on the visual editor being enabled anymore. Props
-    karinamendonca29.
+*   The plugin does not depend on the visual editor being enabled anymore. Props karinamendonca29.
 
 ### 3.1.6 (Feb. 4, 2017) ###
 *   Return `''` (the empty string) when retrieving empty freeform credits.
 *   Honor "Do not display default credit" for featured images.
 
 ### 3.1.5 (Jan. 29, 2017) ###
-*   Prevent invalid link nesting in featured image credits. This means that by default,
-    no `<a>` tags are printed for featured image credits. The old behavior can
-    be restored by including `add_filter( 'media_credit_post_thumbnail_include_links', __return_true );`
-    in the theme's `functions.php`.
-*   "Display credit after posts" is now restricted to the proper single post view
-    (and not every usage of `the_content` hook).
-*   "Display credit after posts" is honored when used together with "Display credit
-    for featured images".
+*   Prevent invalid link nesting in featured image credits. This means that by default, no `<a>` tags are printed for featured image credits. The old behavior can be restored by including `add_filter( 'media_credit_post_thumbnail_include_links', __return_true );` in the theme's `functions.php`.
+*   "Display credit after posts" is now restricted to the proper single post view (and not every usage of `the_content` hook).
+*   "Display credit after posts" is honored when used together with "Display credit for featured images".
 
 ### 3.1.4 (Jan. 1, 2017) ###
 *   Properly sync models when editing image details.
@@ -161,57 +122,43 @@ by <strong>leaving a message in the Wordpress.org [support forums here](https://
 *   Updated TinyMCE components.
 
 ### 3.1.1 (Aug. 15, 2016) ###
-*   Fixed JavaScript error in media uploaded directly from Edit Post (`wp_prepare_attachment_for_js`
-    only gets called after the upload finishes in 4.5.x).
+*   Fixed JavaScript error in media uploaded directly from Edit Post (`wp_prepare_attachment_for_js` only gets called after the upload finishes in 4.5.x).
 
 ### 3.1.0 (Aug. 13, 2016) ###
 *   Optional no-follow attribute added.
 *   Optional schema.org markup added.
-*   Use HTML5 placeholders instead of default text when "no default credits" is
-    set.
+*   Use HTML5 placeholders instead of default text when "no default credits" is set.
 *   Settings have been updated & streamlined.
 *   Added caching for backend queries.
 *   Updated TinyMCE components.
-*   Switched to the new Media API based on Backbone.js introduced in WordPress 3.5
-    for a snappier and more consistent user experience.
-*   Several security fixes and a general code clean-up have been applied due to
-    automatic enforcement of WordPress coding standards.
+*   Switched to the new Media API based on Backbone.js introduced in WordPress 3.5 for a snappier and more consistent user experience.
+*   Several security fixes and a general code clean-up have been applied due to automatic enforcement of WordPress coding standards.
 *   Fixed conflict between "no default credits" and featured image credits.
 
 
 ## Other Notes ##
 **Options**
 
-This plugin provides a few options which appear on the **Media** page under **Settings**.
-These options are:
+This plugin provides a few options which appear on the **Media** page under **Settings**. These options are:
 
 *   Separator
 *   Organization
 *   Display credits after post
 
 **Example**
 
-This is best explained with an example. With a separator of " | " and an organization
-of The Daily Times, media inserted will be followed with a credit line appearing
-as follows, with the username linking to the author page for that user:
+This is best explained with an example. With a separator of " | " and an organization of The Daily Times, media inserted will be followed with a credit line appearing as follows, with the username linking to the author page for that user:
 
 [John Smith]() | The Daily Times
 
 **Further explanation**
 
-*Separator*: These are the characters that separate the display name for a user
-on your blog from the name of the organization, as described below. The default
-separator is " | " but feel free to change this to suit your needs.
+*Separator*: These are the characters that separate the display name for a user on your blog from the name of the organization, as described below. The default separator is " | " but feel free to change this to suit your needs.
 
-*Organization*: This is what appears after the separator as listed above. The default
-organization is the name of your blog.
+*Organization*: This is what appears after the separator as listed above. The default organization is the name of your blog.
 
-*Display credits after post*: With this option enabled, media credit shortcodes
-will not appear by default when inserting media into your posts. Instead, the plugin
-will look through the content of your posts for any media attachments and display
-something like the following at the end of each post with the CSS class .media-credit-end:
+*Display credits after post*: With this option enabled, media credit shortcodes will not appear by default when inserting media into your posts. Instead, the plugin will look through the content of your posts for any media attachments and display something like the following at the end of each post with the CSS class .media-credit-end:
 
 Images courtesy of [John Smith]() | The Daily Times, Michael Scott and Jane Doe.
 
-In this example, John Smith is a user of your blog, while the latter two credits
-are not.
+In this example, John Smith is a user of your blog, while the latter two credits are not.

admin/class-media-credit-admin.php

@@ -1083,6 +1083,7 @@ public function sanitize_option_values( $input ) {
 		$valid_options['credit_at_end']         = false;
 		$valid_options['no_default_credit']     = false;
 		$valid_options['post_thumbnail_credit'] = false;
+		$valid_options['schema_org_markup']     = false;
 
 		// Sanitize the actual input values.
 		foreach ( $input as $key => $value ) {