Merge branch 'hotfix/0.21.6'

Author: garex

CHANGELOG.md

@@ -2,6 +2,13 @@
 ## Changelog ##
 
 
+### 0.21.6 ###
+
+Avoid running test editor code at respondents results page
+
+* Correctly determine test editor
+
+
 ### 0.21.5 ###
 
 Fixup other plugins conflicts

README.md

@@ -8,7 +8,7 @@
 
 **Tested up to:** 4.9
 
-**Stable tag:** 0.21.5
+**Stable tag:** 0.21.6
 
 **License:** GPLv3
 

src/Doer/Feedbacker.php

@@ -18,7 +18,7 @@ public function __construct(
             ->addFilter('plugin_row_meta', array($this, 'onPluginMeta'), WpTesting_WordPress_IPriority::PRIORITY_DEFAULT, 2)
             ->addAction('admin_menu', array($this, 'addPages'))
             ->addAction('wp_ajax_wpt_rateus', array($this, 'ajaxRateUs'))
-            ->addAction('wp_testing_editor_customize_ui_after', array($this, 'customizeEditor'))
+            ->addAction('wp_testing_editor_tests_screen', array($this, 'customizeEditor'))
             ->addAction('add_meta_boxes_wpt_test', array($this, 'customizeEditorMetaboxes'))
         ;
     }

src/Doer/TestEditor.php

@@ -15,7 +15,11 @@ class WpTesting_Doer_TestEditor extends WpTesting_Doer_AbstractEditor
      */
     public function customizeUi($screen)
     {
-        if (!$this->isTestScreen($screen)) {
+        $isTestEditor = $this->isTestScreen($screen, 'id');
+        if ($isTestEditor || $this->isTestScreen($screen, 'post_type')) {
+            $this->wp->doAction('wp_testing_editor_tests_screen');
+        }
+        if (!$isTestEditor) {
             return $this;
         }
         $test = $this->createTest($this->getRequestValue('post'));
@@ -420,15 +424,17 @@ private function emulateRedirectMessage(WpTesting_Model_Test $test)
      * Do we currently at tests?
      *
      * @param WP_Screen $screen
+     * @param string $attribute When comparing by post_type -- we are at any tests screen, by id -- we are at editor
+     *
      * @return boolean
      */
-    private function isTestScreen($screen)
+    private function isTestScreen($screen, $attribute)
     {
         $id = $this->getRequestValue('post');
         if (is_array($id)) {
             return false;
         }
-        if (!empty($screen->post_type) && $screen->post_type == 'wpt_test') {
+        if (!empty($screen->$attribute) && $screen->$attribute == 'wpt_test') {
             return true;
         }
         if ($this->isWordPressAlready('3.3')) {

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.5
+ * Version: 0.21.6
  * Author: Alexander Ustimenko
  * Author URI: http://ustimen.co
  * License: GPL3