Changeset 2665116

Timestamp:

01/26/2022 12:28:41 AM (4 years ago)

Author:

raubvogel

Message:

tagging version 3.25.3

Location:

wp-vgwort

Files:

• tags/3.25.3 (copied) (copied from wp-vgwort/trunk)
• tags/3.25.3/.php-cs-fixer.cache (added)
• tags/3.25.3/includes/long-task.php (modified) (4 diffs)
• tags/3.25.3/includes/markers-manager.php (modified) (1 diff)
• tags/3.25.3/includes/shortcodes.php (modified) (1 diff)
• tags/3.25.3/readme.txt (copied) (copied from wp-vgwort/trunk/readme.txt) (3 diffs)
• tags/3.25.3/wp-vgwort.php (modified) (2 diffs)
• trunk/.php-cs-fixer.cache (added)
• trunk/includes/long-task.php (modified) (4 diffs)
• trunk/includes/markers-manager.php (modified) (1 diff)
• trunk/includes/shortcodes.php (modified) (1 diff)
• trunk/readme.txt (modified) (3 diffs)
• trunk/wp-vgwort.php (modified) (2 diffs)

wp-vgwort/tags/3.25.3/includes/long-task.php

@@ -52 +52 @@
          } else {
              $stats = json_decode(stripslashes($stats), true);
-             if ($stats === false || $stats === null || !is_array($stats)) {
+             if ($stats === false || !is_array($stats)) {
                  wp_send_json(static::create_result(false, null, 0, '', array( array( __('Das Status-Objekt konnte nicht gelesen werden.', WPVGW_TEXT_DOMAIN), WPVGW_ErrorType::Error ) )));
              }
@@ -58 +58 @@
          }
          $offset = $_POST['wpvgw_task_offset'] ?? null;
-         if ($offset === null || !is_numeric($offset) || intval($offset) <= -1) {
+         if (!is_numeric($offset) || intval($offset) <= -1) {
              wp_send_json(static::create_result(false, null, 0, '', array( array( __('Das Offset hat einen ungültigen Wert.', WPVGW_TEXT_DOMAIN), WPVGW_ErrorType::Error ) )));
          }
@@ -69 +69 @@
                  $numberOfIterations = call_user_func_array($this->runFunction, array( $offset, &$stats, &$error_messages ));
                  $offset += $numberOfIterations;
-                 if ($error_messages !== null && is_array($error_messages)) {
+                 if (is_array($error_messages)) {
                      $hasMoreSteps = false;
                      $messages = $error_messages;
@@ -103 +103 @@
          wp_send_json(self::create_result($hasMoreSteps, $stats, $offset, sprintf($this->statusTextTemplate, number_format_i18n($offset)), $messages));
      }
-     private static function create_result($has_more_steps, $stats, $offset, $status_text, $messages = array())
+     private static function create_result($has_more_steps, WPVGW_LongTaskStats $stats = null, $offset = 1, $status_text = '', $messages = array())
      {
          if ($stats !== null && !is_subclass_of($stats, WPVGW_LongTaskStats::class, false)) {

wp-vgwort/tags/3.25.3/includes/markers-manager.php

@@ -375 +375 @@
          }
          $marker = array( 'public_marker' => $public_marker, 'private_marker' => $private_marker, 'server' => $server, 'order_date' => $order_date, 'is_marker_disabled' => $is_marker_disabled, 'is_marker_blocked' => $is_marker_blocked, );
-         switch ($this->insert_marker_in_db($marker)) { case WPVGW_InsertMarkerResults::Inserted: $importMarkersStats->numberOfInsertedMarkers++; break; case WPVGW_InsertMarkerResults::IntegrityError: $updateMarker = array( 'private_marker' => $private_marker, 'order_date' => $order_date ); switch ($this->update_marker_in_db($public_marker, 'public_marker', $updateMarker, array( 'private_marker' => array( null, $private_marker ), 'order_date' => array( null, $order_date ) ))) { case WPVGW_UpdateMarkerResults::Updated: $importMarkersStats->numberOfUpdatedMarkers++; break; case WPVGW_UpdateMarkerResults::UpdateNotNecessary: $importMarkersStats->numberOfDuplicateMarkers++; break; default: $importMarkersStats->numberOfIntegrityErrors++; break; } break; default: WPVGW_Helper::throw_unknown_result_exception(); break; }
+         switch ($this->insert_marker_in_db($marker)) { case WPVGW_InsertMarkerResults::Inserted : $importMarkersStats->numberOfInsertedMarkers++; break; case WPVGW_InsertMarkerResults::IntegrityError : $updateMarker = array( 'private_marker' => $private_marker, 'order_date' => $order_date ); switch ($this->update_marker_in_db($public_marker, 'public_marker', $updateMarker, array( 'private_marker' => array( null, $private_marker ), 'order_date' => array( null, $order_date ) ))) { case WPVGW_UpdateMarkerResults::Updated: $importMarkersStats->numberOfUpdatedMarkers++; break; case WPVGW_UpdateMarkerResults::UpdateNotNecessary: $importMarkersStats->numberOfDuplicateMarkers++; break; default: $importMarkersStats->numberOfIntegrityErrors++; break; } break; default: WPVGW_Helper::throw_unknown_result_exception(); break; }
          return $importMarkersStats;
      }

wp-vgwort/tags/3.25.3/includes/shortcodes.php

@@ -63 +63 @@
          switch ($type) { case 'standard-page-count': if ($formatted) {
              return esc_html(number_format_i18n($this->round($standardPageCount, $decimals, $roundHalf), $decimals));
-         } return $round ? $this->round($standardPageCount, $decimals, $roundHalf) : $standardPageCount; case 'custom-page-count': if ($formatted) {
+         } return $round ? $this->round($standardPageCount, $decimals, $roundHalf) : $standardPageCount; case 'custom-page-count' : if ($formatted) {
              return esc_html(number_format_i18n($this->round($customPageCount, $decimals, $roundHalf), $decimals));
          } return $round ? $this->round($customPageCount, $decimals, $roundHalf) : $customPageCount; case 'text': if ($formatted) {

wp-vgwort/tags/3.25.3/readme.txt

@@ -6 +6 @@
 Tested up to: 5.9
 Requires PHP: 7.0
-Stable tag: 3.25.2
+Stable tag: 3.25.3
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -159 +159 @@
 == Changelog ==
 
+= 3.25.3 =
+* Fehler bez. aufwendiger Operationen behoben. 
+
 = 3.25.2 =
 * Fehler bez. Zählmarke (in-)aktiv setzen behoben. 
@@ -627 +630 @@
 == Upgrade Notice ==
 
+= 3.25.3 =
+Einen Fehler behoben.
+
 = 3.25.2 =
 Einen Fehler behoben.

wp-vgwort/tags/3.25.3/wp-vgwort.php

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/wp-vgwort/
  * Description: Verdienen Sie mit Ihren Beiträgen/Texten Geld durch die Integration von Zählmarken der VG WORT.
- * Version: 3.25.2
+ * Version: 3.25.3
  * Author: Prosodia – Verlag für Musik und Literatur
  * Author URI: https://prosodia.de/
@@ -33 +33 @@
  * The global plugin version.
  */
-define( 'WPVGW_VERSION', '3.25.2' );
+define( 'WPVGW_VERSION', '3.25.3' );
 
 /**

wp-vgwort/trunk/includes/long-task.php

@@ -52 +52 @@
          } else {
              $stats = json_decode(stripslashes($stats), true);
-             if ($stats === false || $stats === null || !is_array($stats)) {
+             if ($stats === false || !is_array($stats)) {
                  wp_send_json(static::create_result(false, null, 0, '', array( array( __('Das Status-Objekt konnte nicht gelesen werden.', WPVGW_TEXT_DOMAIN), WPVGW_ErrorType::Error ) )));
              }
@@ -58 +58 @@
          }
          $offset = $_POST['wpvgw_task_offset'] ?? null;
-         if ($offset === null || !is_numeric($offset) || intval($offset) <= -1) {
+         if (!is_numeric($offset) || intval($offset) <= -1) {
              wp_send_json(static::create_result(false, null, 0, '', array( array( __('Das Offset hat einen ungültigen Wert.', WPVGW_TEXT_DOMAIN), WPVGW_ErrorType::Error ) )));
          }
@@ -69 +69 @@
                  $numberOfIterations = call_user_func_array($this->runFunction, array( $offset, &$stats, &$error_messages ));
                  $offset += $numberOfIterations;
-                 if ($error_messages !== null && is_array($error_messages)) {
+                 if (is_array($error_messages)) {
                      $hasMoreSteps = false;
                      $messages = $error_messages;
@@ -103 +103 @@
          wp_send_json(self::create_result($hasMoreSteps, $stats, $offset, sprintf($this->statusTextTemplate, number_format_i18n($offset)), $messages));
      }
-     private static function create_result($has_more_steps, $stats, $offset, $status_text, $messages = array())
+     private static function create_result($has_more_steps, WPVGW_LongTaskStats $stats = null, $offset = 1, $status_text = '', $messages = array())
      {
          if ($stats !== null && !is_subclass_of($stats, WPVGW_LongTaskStats::class, false)) {

wp-vgwort/trunk/includes/markers-manager.php

@@ -375 +375 @@
          }
          $marker = array( 'public_marker' => $public_marker, 'private_marker' => $private_marker, 'server' => $server, 'order_date' => $order_date, 'is_marker_disabled' => $is_marker_disabled, 'is_marker_blocked' => $is_marker_blocked, );
-         switch ($this->insert_marker_in_db($marker)) { case WPVGW_InsertMarkerResults::Inserted: $importMarkersStats->numberOfInsertedMarkers++; break; case WPVGW_InsertMarkerResults::IntegrityError: $updateMarker = array( 'private_marker' => $private_marker, 'order_date' => $order_date ); switch ($this->update_marker_in_db($public_marker, 'public_marker', $updateMarker, array( 'private_marker' => array( null, $private_marker ), 'order_date' => array( null, $order_date ) ))) { case WPVGW_UpdateMarkerResults::Updated: $importMarkersStats->numberOfUpdatedMarkers++; break; case WPVGW_UpdateMarkerResults::UpdateNotNecessary: $importMarkersStats->numberOfDuplicateMarkers++; break; default: $importMarkersStats->numberOfIntegrityErrors++; break; } break; default: WPVGW_Helper::throw_unknown_result_exception(); break; }
+         switch ($this->insert_marker_in_db($marker)) { case WPVGW_InsertMarkerResults::Inserted : $importMarkersStats->numberOfInsertedMarkers++; break; case WPVGW_InsertMarkerResults::IntegrityError : $updateMarker = array( 'private_marker' => $private_marker, 'order_date' => $order_date ); switch ($this->update_marker_in_db($public_marker, 'public_marker', $updateMarker, array( 'private_marker' => array( null, $private_marker ), 'order_date' => array( null, $order_date ) ))) { case WPVGW_UpdateMarkerResults::Updated: $importMarkersStats->numberOfUpdatedMarkers++; break; case WPVGW_UpdateMarkerResults::UpdateNotNecessary: $importMarkersStats->numberOfDuplicateMarkers++; break; default: $importMarkersStats->numberOfIntegrityErrors++; break; } break; default: WPVGW_Helper::throw_unknown_result_exception(); break; }
          return $importMarkersStats;
      }

wp-vgwort/trunk/includes/shortcodes.php

@@ -63 +63 @@
          switch ($type) { case 'standard-page-count': if ($formatted) {
              return esc_html(number_format_i18n($this->round($standardPageCount, $decimals, $roundHalf), $decimals));
-         } return $round ? $this->round($standardPageCount, $decimals, $roundHalf) : $standardPageCount; case 'custom-page-count': if ($formatted) {
+         } return $round ? $this->round($standardPageCount, $decimals, $roundHalf) : $standardPageCount; case 'custom-page-count' : if ($formatted) {
              return esc_html(number_format_i18n($this->round($customPageCount, $decimals, $roundHalf), $decimals));
          } return $round ? $this->round($customPageCount, $decimals, $roundHalf) : $customPageCount; case 'text': if ($formatted) {

wp-vgwort/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 5.9
 Requires PHP: 7.0
-Stable tag: 3.25.2
+Stable tag: 3.25.3
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -159 +159 @@
 == Changelog ==
 
+= 3.25.3 =
+* Fehler bez. aufwendiger Operationen behoben. 
+
 = 3.25.2 =
 * Fehler bez. Zählmarke (in-)aktiv setzen behoben. 
@@ -627 +630 @@
 == Upgrade Notice ==
 
+= 3.25.3 =
+Einen Fehler behoben.
+
 = 3.25.2 =
 Einen Fehler behoben.

wp-vgwort/trunk/wp-vgwort.php

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/wp-vgwort/
  * Description: Verdienen Sie mit Ihren Beiträgen/Texten Geld durch die Integration von Zählmarken der VG WORT.
- * Version: 3.25.2
+ * Version: 3.25.3
  * Author: Prosodia – Verlag für Musik und Literatur
  * Author URI: https://prosodia.de/
@@ -33 +33 @@
  * The global plugin version.
  */
-define( 'WPVGW_VERSION', '3.25.2' );
+define( 'WPVGW_VERSION', '3.25.3' );
 
 /**