Changeset 1824288

Timestamp:

02/19/2018 02:02:19 AM (8 years ago)

Author:

ErinMorelli

Message:

Version 1.2.1 - Critical Bug Fix

Location:

dlm-changelog

Files:

• tags/1.2.1 (added)
• tags/1.2.1/README.txt (added)
• tags/1.2.1/assets (added)
• tags/1.2.1/assets/css (added)
• tags/1.2.1/assets/css/admin.css (added)
• tags/1.2.1/assets/css/shortcode.css (added)
• tags/1.2.1/assets/js (added)
• tags/1.2.1/assets/js/admin.js (added)
• tags/1.2.1/assets/js/shortcode.js (added)
• tags/1.2.1/dlm-changelog.php (added)
• tags/1.2.1/includes (added)
• tags/1.2.1/includes/dlmcl-admin.php (added)
• tags/1.2.1/includes/dlmcl-shortcode.php (added)
• tags/1.2.1/languages (added)
• tags/1.2.1/languages/dlm-changelog.pot (added)
• tags/1.2.1/license.txt (added)
• trunk/README.txt (modified) (3 diffs)
• trunk/dlm-changelog.php (modified) (4 diffs)
• trunk/includes/dlmcl-admin.php (modified) (2 diffs)
• trunk/includes/dlmcl-shortcode.php (modified) (1 diff)

dlm-changelog/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 4.9.4
-Stable tag: 1.2.0
+Stable tag: 1.2.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -92 +92 @@
 == Changelog ==
 
+= 1.2.1 =
+* Overrides and fixes an issue introduced DLM where saving a download will remove all existing saved changelog content for that download's versions
+
 = 1.2.0 = 
 * Fixed incompatibility issues with DLM versions 4.0+
@@ -122 +125 @@
 == Upgrade Notice ==
 
+= 1.2.1 =
+* CRITICAL UPDATE to fix a bug conflict with DLM that caused all changelog data to be deleted when updating a download via DLM
+
 = 1.0.1 =
 * Fixed issue where not all published downloads were showing in admin dropdown

dlm-changelog/trunk/dlm-changelog.php

@@ -4 +4 @@
  * Plugin URI: https://www.erinmorelli.com/projects/dlm-changelog/
  * Description: An add-on for Mike Jolley's Download Monitor that adds version changelog functionality.
- * Version: 1.2.0
+ * Version: 1.2.1
  * Author: Erin Morelli
  * Author URI: https://erinmorelli.com/
@@ -42 +42 @@
 }
 
+// Set post meta name
+define('DLMCL_POST_CONTENT', '_dlmcl_post_content');
+
 
 /**
@@ -51 +54 @@
 {
     // Check for new version
-    $dlmcl_curr_version = '1.2.0';
+    $dlmcl_curr_version = '1.2.1';
 
     // Define new version option
@@ -297 +300 @@
 // Set uninstall hook
 register_uninstall_hook(__FILE__, 'DLMCL_Plugin_uninstall');
+
+
+/**
+ * Get post content for a given download version
+ *
+ * @param int $version_id The WP post ID for the version
+ *
+ * @return string The HTML-formatted content for the version
+ */
+function DLMCL_Plugin_Version_content($version_id)
+{
+    $version = get_post($version_id);
+
+    if ($version->post_content == '') {
+        return get_post_meta($version_id, DLMCL_POST_CONTENT, true);
+    }
+
+    return $version->post_content;
+}

dlm-changelog/trunk/includes/dlmcl-admin.php

@@ -19 +19 @@
  * @package DLMCL\Admin
  */
+
+
+/**
+ * Saves all version post content to a meta value to prevent overrides
+ *
+ * @param int $version_id The WP post ID of the version being saved
+ *
+ * @return void
+ */
+function DLMCL_Admin_override($version_id)
+{
+    // We only care about DLM version posts
+    if (get_post_type($version_id) != 'dlm_download_version') {
+        return;
+    }
+
+    // Get current post and meta data
+    $version = get_post($version_id);
+    $saved_content = get_post_meta($version_id, DLMCL_POST_CONTENT, true);
+
+    // Update our post meta if there's content
+    if (!$saved_content || $version->post_content != '') {
+        update_post_meta($version_id, DLMCL_POST_CONTENT, $version->post_content);
+    }
+}
+
+// Add to save post hook
+add_action('save_post', 'DLMCL_Admin_override');
 
 
@@ -208 +236 @@
                             data-id="<?php echo $this_version_id; ?>"
                             data-placeholder="<?php _e('Click to add version notes', 'dlm-changelog'); ?>"
-                        ><?php echo $this_version->post_content; ?></div>
+                        ><?php echo DLMCL_Plugin_Version_content($this_version_id); ?></div>
                     </td>
                     <td><?php echo date('m/d/y', strtotime($this_version->post_date)); ?></td>

dlm-changelog/trunk/includes/dlmcl-shortcode.php

@@ -212 +212 @@
 
         // Release Notes
-        $output .= $release->post_content ."\n";
+        $output .= DLMCL_Plugin_Version_content($version_id)."\n";
 
         // End version output