Merge branch 'hotfix/0.21.5'

garex · Jan 12, 2018 · ea6a05d · ea6a05d
2 parents 1415a63 + c574ba2
commit ea6a05d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 ## Changelog ##
 
 
+### 0.21.5 ###
+
+Fixup other plugins conflicts
+
+* Clean up test data on save in more reliable way
+* Save test after other plugins, in latest filter
+
+If you use Yoast SEO — you must upgrade to save it's metadata.
+
+
 ### 0.21.4 ###
 
 Welcome WordPress 4.9

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 **Tested up to:** 4.9
 
-**Stable tag:** 0.21.4
+**Stable tag:** 0.21.5
 
 **License:** GPLv3
 

diff --git a/src/Doer/TestEditor.php b/src/Doer/TestEditor.php
@@ -87,7 +87,7 @@ public function customizeUi($screen)
             ->addMetaBox('wpt_quick_fill_scores', __('Quick Fill Scores', 'wp-testing'),    array($this, 'renderQuickFillScores'), 'wpt_test')
             ->addMetaBox('wpt_edit_formulas',  __('Edit Formulas', 'wp-testing'),     array($this, 'renderEditFormulas'),  'wpt_test')
             ->addAction('wp_testing_test_store_all_before', array($this, 'updateMetaOptions'))
-            ->addAction('save_post',     array($this, 'saveTest'), WpTesting_WordPress_IPriority::PRIORITY_DEFAULT, 2)
+            ->addAction('wp_insert_post', array($this, 'saveTest'), 99, 2)
         ;
         $this
             ->addSubmitMiscOptions()

diff --git a/src/Model/Test.php b/src/Model/Test.php
@@ -64,9 +64,14 @@ public function __construct($key = null)
                 return;
             }
             $postAsArray = (array)$key;
-            unset($postAsArray['ancestors']);
-            unset($postAsArray['filter']);
-            unset($postAsArray['format_content']);
+
+            $columns = $this->getColumnsAsMethodsOnce($this);
+            foreach (array_keys($postAsArray) as $column) {
+                if (!isset($columns[$column])) {
+                    unset($postAsArray[$column]);
+                }
+            }
+
             $key = new ArrayIterator(array($postAsArray));
         }
         parent::__construct($key);

diff --git a/wp-testing.php b/wp-testing.php
@@ -3,7 +3,7 @@
  * Plugin Name: Wp-testing
  * Plugin URI: http://wordpress.org/extend/plugins/wp-testing/
  * Description: Helps to create psychological tests.
- * Version: 0.21.4
+ * Version: 0.21.5
  * Author: Alexander Ustimenko
  * Author URI: http://ustimen.co
  * License: GPL3