Merge pull request #104 from publishpress/release-2-3-8

Release 2.3.8

admin/admin-init_rvy.php

@@ -137,6 +137,43 @@ function rvy_admin_init() {
 
 				break;
 
+			case 'unschedule_revision' :
+				$unscheduled = 0;
+				$is_administrator = current_user_can('administrator');
+
+				require_once( dirname(__FILE__).'/revision-action_rvy.php');
+
+				foreach ((array) $post_ids as $post_id) {
+					if (!$revision = get_post($post_id)) {
+						continue;
+					}
+
+					if ('future-revision' != $revision->post_status) {
+						continue;
+					}
+
+					if ( !$is_administrator 
+					&& !agp_user_can($type_obj->cap->edit_post, rvy_post_id($revision->ID), '', ['skip_revision_allowance' => true])
+					) {
+						if (count($post_ids) == 1) {
+							wp_die( __('Sorry, you are not allowed to approve this revision.', 'revisionary') );
+						} else {
+							continue;
+						}
+					}
+
+					if (rvy_revision_unschedule($revision->ID)) {
+						$unscheduled++;
+					}
+				}
+
+				if ($unscheduled) {
+					$arg = 'unscheduled_count';
+					$sendback = add_query_arg($arg, $unscheduled, $sendback);
+				}
+
+				break;
+
 			case 'delete':
 				$deleted = 0;
 				foreach ( (array) $post_ids as $post_id ) {
@@ -167,6 +204,7 @@ function rvy_admin_init() {
 
 		if ($sendback) {
 			$sendback = remove_query_arg( array('action', 'action2', '_wp_http_referer', '_wpnonce', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback );
+			$sendback = str_replace('#038;', '&', $sendback);	// @todo Proper decode
 			wp_redirect($sendback);
 		}
 
@@ -189,10 +227,6 @@ function rvy_admin_init() {
 				require_once( dirname(__FILE__).'/revision-action_rvy.php');	
 				add_action( 'wp_loaded', 'rvy_revision_publish' );
 
-			} elseif ( ! empty($_GET['action']) && ('unschedule' == $_GET['action']) ) {
-				require_once( dirname(__FILE__).'/revision-action_rvy.php');	
-				add_action( 'wp_loaded', 'rvy_revision_unschedule' );
-
 			} elseif ( ! empty($_POST['action']) && ('bulk-delete' == $_POST['action'] ) ) {
 				require_once( dirname(__FILE__).'/revision-action_rvy.php');	
 				add_action( 'wp_loaded', 'rvy_revision_bulk_delete' );

admin/admin_rvy.php

@@ -30,6 +30,7 @@ function __construct() {
 
 		add_action('admin_head', array(&$this, 'admin_head'));
 		add_action('admin_enqueue_scripts', array(&$this, 'admin_scripts'));
+		add_action('admin_print_scripts', [$this, 'admin_print_scripts'], 99);
 
 		if ( ! defined('XMLRPC_REQUEST') && ! strpos($script_name, 'p-admin/async-upload.php' ) ) {
 			global $blog_id;
@@ -530,6 +531,26 @@ function admin_scripts() {
 				</style>
 				<?php
 			}
+
+			if (!class_exists('DS_Public_Post_Preview')) {
+				?>
+				<style>
+				div.edit-post-post-visibility, div.edit-post-post-status div {
+					display:none;
+				}
+				</style>
+				<?php
+			} else {
+				?>
+				<style>
+				/*
+				div.edit-post-post-status #inspector-checkbox-control-1 {
+					display:none;
+				}
+				*/
+				</style>
+				<?php
+			}
 		}
 
 		wp_enqueue_style('revisionary-admin-common', RVY_URLPATH . '/common/css/pressshack-admin.css', [], REVISIONARY_VERSION);
@@ -539,6 +560,22 @@ function admin_scripts() {
 		}
  	}
 
+	function admin_print_scripts() {
+		if (class_exists('DS_Public_Post_Preview')) {
+			?>
+			<script type="text/javascript">
+			/* <![CDATA[ */
+			jQuery(document).ready( function($) {
+				setInterval(function() {
+					$("div.edit-post-post-status label:not(:contains('<?php _e('Enable public preview');?>')):not('[for=public-post-preview-url]')"). closest('div').hide();
+				}, 100);
+			});
+			/* ]]> */
+			</script>
+			<?php
+		}
+	}
+
 	function admin_head() {
 		//echo '<link rel="stylesheet" href="' . RVY_URLPATH . '/admin/revisionary.css" type="text/css" />'."\n";
 

admin/class-list-table_rvy.php

@@ -176,10 +176,10 @@ function pre_query_where_filter($where, $args = []) {
 			$can_edit_others_types = [];
 
 			foreach(array_keys($revisionary->enabled_post_types) as $post_type) {
-				$type_obj = get_post_type_object($post_type);
-
-				if (agp_user_can($type_obj->cap->edit_others_posts, 0, '', ['skip_revision_allowance' => true])) {
-					$can_edit_others_types[]= $post_type;
+				if ($type_obj = get_post_type_object($post_type)) {
+					if (agp_user_can($type_obj->cap->edit_others_posts, 0, '', ['skip_revision_allowance' => true])) {
+						$can_edit_others_types[]= $post_type;
+					}
 				}
 			}
 
@@ -724,6 +724,10 @@ protected function get_bulk_actions() {
 		if ($approval_potential = apply_filters('revisionary_bulk_action_approval', $approval_potential)) {
 			$actions['approve_revision'] = __('Approve');
 			$actions['publish_revision'] = __('Publish');
+
+			if (revisionary()->getOption('scheduled_revisions')) {
+				$actions['unschedule_revision'] = __('Unschedule', 'revisionary');
+			}
 		}
 
 		$actions['delete'] = __( 'Delete Permanently' );

admin/revision-action_rvy.php

@@ -721,9 +721,9 @@ function rvy_revision_bulk_delete() {
 	exit;
 }
 
-function rvy_revision_unschedule() {
-	require_once( ABSPATH . 'wp-admin/admin.php');
-	$revision_id = (int) $_GET['revision'];
+function rvy_revision_unschedule($revision_id) {
+	global $wpdb;
+
 	$redirect = '';
 
 	do {
@@ -742,34 +742,17 @@ function rvy_revision_unschedule() {
 		}
 
 		if ( $type_obj = get_post_type_object( $revision->post_type ) ) {
-			if ( ! agp_user_can( $type_obj->cap->edit_post, $published_id, '', array( 'skip_revision_allowance' => true ) ) )
+			if ( ! agp_user_can( $type_obj->cap->edit_post, $published_id, '', array( 'skip_revision_allowance' => true ) ) ) {
 				break;
 		}
+		}
 
-		check_admin_referer('unschedule-revision_' .  $revision_id);
-
-		global $wpdb;
-		$wpdb->query( 
-			$wpdb->prepare(
-				"UPDATE $wpdb->posts SET post_status = 'pending-revision' WHERE ID = %d",
-				$revision_id
-			)
-		);
+		$wpdb->update( $wpdb->posts, array( 'post_status' => 'pending-revision' ), array( 'ID' => $revision->ID ) );
 
 		rvy_update_next_publish_date();
-
-		$redirect = rvy_preview_url($revision);
 	} while (0);
 
-	if ( ! $redirect ) {
-		if ( ! empty($post) && is_object($post) && ( 'post' != $post->post_type ) ) {
-			$redirect = "edit.php?post_type={$post->post_type}";
-		} else
-			$redirect = 'edit.php';
-	}
-
-	wp_redirect( $redirect );
-	exit;
+	return true;
 }
 
 function rvy_revision_publish($revision_id = false) {

admin/revision-queue_rvy.php

@@ -29,6 +29,7 @@
 	'updated' => 0,
 	'locked' => 0,
 	'approved_count' => isset( $_REQUEST['approved_count'] )   ? absint( $_REQUEST['approved_count'] )   : 0,
+	'unscheduled_count' => isset( $_REQUEST['unscheduled_count'] ) ? absint( $_REQUEST['unscheduled_count'] )   : 0,
 	'published_count' => isset( $_REQUEST['published_count'] )   ? absint( $_REQUEST['published_count'] )   : 0,
 	'trashed' => 0,
 	'untrashed' => 0,
@@ -37,6 +38,7 @@
 $bulk_messages = [];
 $bulk_messages['post'] = array(
 	'approved_count'   => sprintf(_n( '%s revision approved.', '%s revisions approved.', $bulk_counts['approved_count'], 'revisionary' ), $bulk_counts['approved_count']),
+	'unscheduled_count' => sprintf(_n( '%s revision unscheduled.', '%s revisions unscheduled.', $bulk_counts['unscheduled_count'], 'revisionary' ), $bulk_counts['unscheduled_count']),
 	'published_count'   => sprintf(_n( '%s revision published.', '%s revisions published.', $bulk_counts['published_count'], 'revisionary' ), $bulk_counts['published_count']),
 	'deleted'   => sprintf(_n( '%s revision permanently deleted.', '%s revisions permanently deleted.', $bulk_counts['deleted'] ), $bulk_counts['deleted']),
 );

admin/rvy-revision-edit.css

@@ -1,9 +1,5 @@
-div.edit-post-post-visibility {
-display:none;
-}
-
-div.edit-post-post-status div {
-display:none;
+div.publishpress-extended-post-privacy, div.publishpress-extended-post-status {
+display: none;
 }
 
 div.edit-post-post-status div.edit-post-post-schedule, div.edit-post-post-status div.edit-post-post-schedule div {