Phing release of v161129 with the following changes:

- **Bug Fix:** This release corrects a nasty bug that was first introduced in the previous release, resulting in the loss of template modifications when/if any Comment Mail options were edited after having upgraded to the previous release. See [Issue #322](#322).

  In short, please avoid v161118 (the previous release).

  _**Note:** If you already upgraded to v161118, but you have not edited your Comment Mail options yet (or had no template modifications anyway), there is no cause for alarm._

  _However, if you upgraded to v161118 and **did** edit your Comment Mail options after updating, and if you also modified Comment Mail templates, you may have experienced a loss of template data; i.e., the changes you made to the default templates may have been lost as a result of this bug. We are very sorry about this. Please see [Issue #322](#322) for additional details._

Author: raamdev

.gitchange

@@ -1,3 +1,3 @@
 1460554614
-853d9120b42cf4f2eabe2f35ea18a6ace7170ea6:581cd82eabb520.85323973
-d0e05c36184f81b133761b71ca6ee0136be67409:582e5cef6a3044.73140470
+853d9120b42cf4f2eabe2f35ea18a6ace7170ea6:583a062c6569f2.27142826
+d0e05c36184f81b133761b71ca6ee0136be67409:583ccb0375b9f7.30396941

CHANGELOG.md

@@ -1,3 +1,13 @@
+## v161129
+
+- **Bug Fix:** This release corrects a nasty bug that was first introduced in the previous release, resulting in the loss of template modifications when/if any Comment Mail options were edited after having upgraded to the previous release. See [Issue #322](https://github.com/websharks/comment-mail/issues/322).
+
+  In short, please avoid v161118 (the previous release).
+
+  _**Note:** If you already upgraded to v161118, but you have not edited your Comment Mail options yet (or had no template modifications anyway), there is no cause for alarm._
+
+  _However, if you upgraded to v161118 and **did** edit your Comment Mail options after updating, and if you also modified Comment Mail templates, you may have experienced a loss of template data; i.e., the changes you made to the default templates may have been lost as a result of this bug. We are very sorry about this. Please see [Issue #322](https://github.com/websharks/comment-mail/issues/322) for additional details._
+
 = v161118 =
 
 - **Bug Fix:** Exclude unapproved comments from the dropdown menu on the 'Subscribe Without Commenting' form. See [Issue #299](https://github.com/websharks/comment-mail/issues/299).

plugin.php

@@ -8,7 +8,7 @@
  * @license   GNU General Public License, version 3
  */
 /*
-Version: 161118
+Version: 161129
 Text Domain: comment-mail
 Plugin Name: Comment Mail
 

readme.txt

@@ -1,6 +1,6 @@
 === Comment Mail ===
 
-Stable tag: 161118
+Stable tag: 161129
 Requires at least: 4.4
 Tested up to: 4.7-alpha
 Text Domain: comment-mail
@@ -258,10 +258,19 @@ Requires PHP v5.4+.
 
 == Changelog ==
 
+= v161129 =
+
+- **Bug Fix:** This release corrects a nasty bug that was first introduced in the previous release, resulting in the loss of template modifications when/if any Comment Mail options were edited after having upgraded to the previous release. See [Issue #322](https://github.com/websharks/comment-mail/issues/322). In short, please avoid v161118 (the previous release).
+
+  _**Note:** If you already upgraded to v161118, but you have not edited your Comment Mail options yet (or had no template modifications anyway), there is no cause for alarm._
+
+  _However, if you upgraded to v161118 and **did** edit your Comment Mail options after updating, and if you also modified Comment Mail templates, you may have experienced a loss of template data; i.e., the changes you made to the default templates may have been lost as a result of this bug. We are very sorry about this. Please see [Issue #322](https://github.com/websharks/comment-mail/issues/322) for additional details._
+
 = v161118 =
 
 - **Bug Fix:** Exclude unapproved comments from the dropdown menu on the 'Subscribe Without Commenting' form. See [Issue #299](https://github.com/websharks/comment-mail/issues/299).
 - **Enhancement:** When parsing templates, this release uses `include()` instead of `eval()` whenever possible. This improves compatibility with shared hosting providers and makes it easier to debug template parsing issues should they occur. See [Issue #192](https://github.com/websharks/comment-mail/issues/192).
+- **Enhancement:** When parsing templates, this release uses `include()` instead of `eval()` whenever possible. This improves compatibility with shared hosting providers and makes it easier to debug template parsing issues should they occur. See [Issue #192](https://github.com/websharks/comment-mail/issues/192).
 - **PHP v7 Compatibility:** After further testing, it was found that while Comment Mail is compatible with PHP v7.0, you must be running PHP v7.0.9+. Starting with this release of Comment Mail if you're running PHP v7 < 7.0.9 a warning is displayed in the WordPress Dashboard asking the site owner to upgrade to PHP v7.0.9 or higher. Note: While PHP v7.0.9 is adequate, PHP v7.0.10 is strongly recommended. See [Issue #272](https://github.com/websharks/comment-mail/issues/272).
 - **New SparkPost Integration** (Pro):  It is now possible to use SparkPost for Replies-via-Email (RVE) instead of Mandrill. Note that SparkPost is now the suggested RVE Handler for Comment Mail because Mandrill changed its pricing structure a while back. In short, Mandrill requires a fee, whereas SparkPost (recommended) offers Relay Webhooks as a part of their free plan. See [Issue #265](https://github.com/websharks/comment-mail/issues/265).
 - **New Feature** (Pro): Adding support for MailChimp integration. It is now possible to give users the option of subscribing to your site-wide mailing list whenever they leave a comment or reply; i.e., in addition to subscribing to comment reply notifications they can also join your MailChimp mailing list. See [Issue #114](https://github.com/websharks/comment-mail/issues/114).

src/includes/classes/Template.php

@@ -97,10 +97,11 @@ public function __construct($file, $type = '', $force_default = false)
         if (!$this->file) { // Empty file property?
             throw new \exception(__('Empty file.', 'comment-mail'));
         }
-        $this->snippet_sub_dir = dirname($this->file).'/snippet';
+        $this->force_default = (bool) $force_default; // Before `getFilePath()`.
+
         $this->file_path       = $this->getFilePath();
+        $this->snippet_sub_dir = dirname($this->file).'/snippet';
 
-        $this->force_default = (bool) $force_default;
         $this->file_contents = $this->getFileContents();
         $this->current_vars  = []; // Initialize.
     }

src/includes/stub.php

@@ -12,7 +12,7 @@
 }
 require_once dirname(__DIR__).'/vendor/autoload.php';
 
-${__FILE__}['version'] = '161118'; //version//
+${__FILE__}['version'] = '161129'; //version//
 ${__FILE__}['plugin']  = dirname(dirname(__DIR__)).'/plugin.php';
 ${__FILE__}['ns_path'] = str_replace('\\', '/', __NAMESPACE__);
 ${__FILE__}['is_pro']  = strtolower(basename(${__FILE__}['ns_path'])) === 'pro';