Merge pull request #580 from publishpress/release-3.0.6

Release 3.0.6

admin/options.php

@@ -190,7 +190,7 @@ function options_ui( $sitewide = false, $customize_defaults = false ) {
 				$this->form_options[$tab_name][$section_name] = array_intersect( $this->form_options[$tab_name][$section_name], array_keys($rvy_options_sitewide) );
 			} elseif ('license' != $section_name) {
 				$this->form_options[$tab_name][$section_name] = array_diff( $this->form_options[$tab_name][$section_name], array_keys($rvy_options_sitewide) );
-		}
+			}
 		}
 	}
 

admin/post-editor-workflow-ui_rvy.php

@@ -195,6 +195,13 @@ public static function postLinkParams($args = []) {
                 'scheduledURL' => rvy_nc_url( add_query_arg('get_new_revision', $post->ID, get_permalink($post->ID))),
                 'update' => __('Update', 'revisionary'),
             ));
+
+            if (empty($vars['actionCaption'])) {
+                $vars = array_merge($vars, array(
+                    'actionCaption' => '',
+                    'ajaxurl' => rvy_admin_url(''),
+                ));
+            }
         }
 
         return $vars;

admin/rvy_post-block-edit.dev.js

@@ -29,9 +29,10 @@ jQuery(document).ready( function($) {
 
 	var RvySubmissionUI = function() {
 		if (rvyObjEdit.ajaxurl && !$('button.revision-approve').length) {
+			var style = (rvyObjEdit.actionCaption == '') ? ' style="display:none"' : '';
 
 			var html = '<div class="rvy-creation-ui"><a href="javascript:void(0)" class="revision-approve" title="'
-			+ rvyObjEdit.actionTitle + '"><button type="button" class="components-button revision-approve revision-create is-primary ppr-purple-button">'
+			+ rvyObjEdit.actionTitle + '"' + style + '><button type="button" class="components-button revision-approve revision-create is-primary ppr-purple-button"' + style + '>'
 			+ rvyObjEdit.actionCaption + '</button></a>'
 
 			+ '<div class="revision-creating" style="display: none;">'

admin/rvy_post-classic-edit.dev.js

@@ -8,8 +8,9 @@
 jQuery(document).ready( function($) {
 	var RvySubmissionUI = function() {
 		if (rvyObjEdit.ajaxurl && !$('div.rvy-creation-ui').length) {
-
-            var html = '<div class="rvy-creation-ui"><a href="javascript:void(0)" class="button revision-approve revision-create" style="margin-top: 15px; margin-bottom: 15px" title="' 
+			var hideStyle = (rvyObjEdit.actionCaption == '') ? ' style="display:none"' : '';
+
+            var html = '<div class="rvy-creation-ui"' + hideStyle + '><a href="javascript:void(0)" class="button revision-approve revision-create" style="margin-top: 15px; margin-bottom: 15px" title="' 
 			+ rvyObjEdit.actionTitle + '">' 
 			+ rvyObjEdit.actionCaption + '</a>'
 
@@ -192,14 +193,19 @@ jQuery(document).ready( function($) {
 		if ((tdiff > 1000)) {
 			RvySelectedFutureDate = true;
 
+			$('.rvy-creation-ui').show();
 			$('.rvy-creation-ui .revision-create').hide();
 			$('.rvy-creation-ui .revision-created-wrapper').hide();
 			$('.rvy-creation-ui .revision-scheduled-wrapper').hide();
             $('.rvy-creation-ui .revision-schedule').show();
 
             $('#publish').hide();
-
 		} else {
+
+			if ('' == rvyObjEdit.actionCaption) {
+				$('.rvy-creation-ui').hide();
+			}
+
 			$('.rvy-creation-ui .revision-schedule').hide();
 			$('.rvy-creation-ui .revision-scheduled-wrapper').hide();
 			$('.rvy-creation-ui .revision-created-wrapper').hide();