From f6eff55f5b435e8e53f24e79e84f197c5fcc1edc Mon Sep 17 00:00:00 2001 From: JDGrimes Date: Sat, 11 Nov 2017 11:52:10 -0500 Subject: [PATCH 1/4] Ranks: avoid fatal errors when a rank type doesn't exist This is just a sanity check that shouldn't usually be triggered. Fixes #744 --- src/components/ranks/classes/rank/type.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/ranks/classes/rank/type.php b/src/components/ranks/classes/rank/type.php index 2adb7b11..1e1e0336 100644 --- a/src/components/ranks/classes/rank/type.php +++ b/src/components/ranks/classes/rank/type.php @@ -272,6 +272,10 @@ final public function maybe_increase_user_rank( $user_id, $rank, array $args = a $rank_type = WordPoints_Rank_Types::get_type( $next_rank->type ); + if ( ! $rank_type ) { + return $rank; + } + if ( ! $rank_type->can_transition_user_rank( $user_id, $next_rank, $args ) ) { return $rank; } @@ -300,6 +304,10 @@ public function maybe_increase_user_ranks( array $user_ids, WordPoints_Rank $ran $rank_type = WordPoints_Rank_Types::get_type( $next_rank->type ); + if ( ! $rank_type ) { + return array(); + } + // If the rank type supports bulk increases, use that. if ( $rank_type instanceof WordPoints_Rank_Type_Bulk_CheckI ) { @@ -354,6 +362,10 @@ final public function maybe_decrease_user_rank( $user_id, $rank, array $args = a $rank_type = WordPoints_Rank_Types::get_type( $rank->type ); + if ( ! $rank_type ) { + return $rank; + } + if ( $rank_type->can_transition_user_rank( $user_id, $rank, $args ) ) { return $rank; } @@ -388,6 +400,10 @@ public function maybe_decrease_user_ranks( array $user_ids, WordPoints_Rank $ran $rank_type = WordPoints_Rank_Types::get_type( $rank->type ); + if ( ! $rank_type ) { + return array(); + } + // If the rank type supports bulk checks, use that. if ( $rank_type instanceof WordPoints_Rank_Type_Bulk_CheckI ) { From 677d061adabf3673dd1ca98d0ae640b6abee76d0 Mon Sep 17 00:00:00 2001 From: JDGrimes Date: Sat, 11 Nov 2017 11:55:17 -0500 Subject: [PATCH 2/4] Points logs: avoid fatal errors after deactivating BuddyPress Fixes #745 --- src/components/points/classes/logs/view.php | 4 ++-- .../points/classes/logs/viewing/restriction/wrapper.php | 2 +- src/components/points/classes/logs/viewing/restrictions.php | 2 +- src/components/points/includes/logs.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/points/classes/logs/view.php b/src/components/points/classes/logs/view.php index cd9d9d81..3cf72c68 100644 --- a/src/components/points/classes/logs/view.php +++ b/src/components/points/classes/logs/view.php @@ -202,9 +202,9 @@ protected function logs() { foreach ( $this->logs as $log ) { - if ( isset( $current_site_id ) && $current_site_id !== $log->blog_id ) { + if ( isset( $current_site_id ) && $current_site_id !== (int) $log->blog_id ) { switch_to_blog( $log->blog_id ); - $current_site_id = $log->blog_id; + $current_site_id = (int) $log->blog_id; } $this->restriction = $viewing_restrictions->get_restriction( $log ); diff --git a/src/components/points/classes/logs/viewing/restriction/wrapper.php b/src/components/points/classes/logs/viewing/restriction/wrapper.php index 91b8eb4d..15b9195c 100644 --- a/src/components/points/classes/logs/viewing/restriction/wrapper.php +++ b/src/components/points/classes/logs/viewing/restriction/wrapper.php @@ -91,7 +91,7 @@ public function applies() { */ public function user_can( $user_id ) { - if ( $this->log->blog_id && get_current_blog_id() !== $this->log->blog_id ) { + if ( $this->log->blog_id && get_current_blog_id() !== (int) $this->log->blog_id ) { $switched = switch_to_blog( $this->log->blog_id ); } diff --git a/src/components/points/classes/logs/viewing/restrictions.php b/src/components/points/classes/logs/viewing/restrictions.php index b4c6451b..7df86bd6 100644 --- a/src/components/points/classes/logs/viewing/restrictions.php +++ b/src/components/points/classes/logs/viewing/restrictions.php @@ -74,7 +74,7 @@ public function get_restriction( $log ) { */ public function apply_legacy_filters( $user_id, $log ) { - if ( $log->blog_id && get_current_blog_id() !== $log->blog_id ) { + if ( $log->blog_id && get_current_blog_id() !== (int) $log->blog_id ) { $switched = switch_to_blog( $log->blog_id ); } diff --git a/src/components/points/includes/logs.php b/src/components/points/includes/logs.php index a8176216..fc2b390e 100644 --- a/src/components/points/includes/logs.php +++ b/src/components/points/includes/logs.php @@ -434,7 +434,7 @@ function wordpoints_flush_points_logs_caches( $args = array() ) { function wordpoints_user_can_view_points_log( $user_id, $log ) { // We do this just once here for optimization, as otherwise it would run 3 times. - if ( $log->blog_id && get_current_blog_id() !== $log->blog_id ) { + if ( $log->blog_id && get_current_blog_id() !== (int) $log->blog_id ) { $switched = switch_to_blog( $log->blog_id ); } From fd91d55b71001ba20043f780dc063d7f9c8a4785 Mon Sep 17 00:00:00 2001 From: JDGrimes Date: Sat, 11 Nov 2017 15:44:34 -0500 Subject: [PATCH 3/4] Extensions: check for updates after activating a license This ensures that the extension info is up to date, thus avoiding "Update package not found" errors when an update has been detected but the package not supplied because the license wasn't yet set at the time. Fixes #749 --- src/admin/includes/functions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/admin/includes/functions.php b/src/admin/includes/functions.php index 40b9336d..08b3fe65 100644 --- a/src/admin/includes/functions.php +++ b/src/admin/includes/functions.php @@ -1463,6 +1463,7 @@ function wordpoints_admin_save_extension_licenses( $extensions ) { if ( true === $result ) { wordpoints_show_admin_message( esc_html__( 'License activated.', 'wordpoints' ) ); $extension_data->set( 'license_key', $license_key ); + wordpoints_check_for_extension_updates_now(); } elseif ( is_wp_error( $result ) ) { // translators: Error message. wordpoints_show_admin_error( sprintf( esc_html__( 'Sorry, there was an error while trying to activate the license: %s', 'wordpoints' ), $result->get_error_message() ) ); From 425120cf7d1ea5bc6a2985b6507ad102eba7a990 Mon Sep 17 00:00:00 2001 From: JDGrimes Date: Mon, 13 Nov 2017 10:29:24 -0500 Subject: [PATCH 4/4] 2.4.1 --- CHANGELOG.md | 9 +++ package.json | 2 +- src/includes/constants.php | 2 +- src/languages/wordpoints-es_ES.mo | Bin 20695 -> 20695 bytes src/languages/wordpoints-es_ES.po | 128 ++++++++++++++--------------- src/languages/wordpoints-lt.mo | Bin 4196 -> 4196 bytes src/languages/wordpoints-lt.po | 128 ++++++++++++++--------------- src/languages/wordpoints-pt_BR.mo | Bin 20744 -> 20744 bytes src/languages/wordpoints-pt_BR.po | 128 ++++++++++++++--------------- src/languages/wordpoints.pot | 130 +++++++++++++++--------------- src/readme.txt | 15 +++- src/wordpoints.php | 4 +- 12 files changed, 283 insertions(+), 263 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94f9f271..69399f26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,14 @@ This is the developer changelog for WordPoints. For a user-centric changelog, se Nothing documented yet. +## [2.4.1] - 2017-11-13 + +### Fixed + +- More fatal errors when viewing the points logs after deactivating the BuddyPress plugin. #745 +- Fatal errors when a rank type is not known. #744 +- Stale extension data not being refreshed when after activating the extension's license. #749 + ## [2.4.0] - 2017-10-26 ### Requires @@ -525,6 +533,7 @@ Nothing documented yet. - Notices for ophaned comments in comment points hooks. #436 [unreleased]: https://github.com/WordPoints/wordpoints/compare/master...develop +[2.4.1]: https://github.com/WordPoints/wordpoints/compare/2.4.0...2.4.1 [2.4.0]: https://github.com/WordPoints/wordpoints/compare/2.3.0...2.4.0 [2.3.0]: https://github.com/WordPoints/wordpoints/compare/2.2.2...2.3.0 [2.2.2]: https://github.com/WordPoints/wordpoints/compare/2.2.1...2.2.2 diff --git a/package.json b/package.json index f9291856..51b7bf24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wordpoints", - "version": "2.4.0", + "version": "2.4.1", "description": "Gamify your WordPress site with points.", "repository": { "type": "git", diff --git a/src/includes/constants.php b/src/includes/constants.php index ab980602..72b7ee7b 100644 --- a/src/includes/constants.php +++ b/src/includes/constants.php @@ -22,7 +22,7 @@ * * @const WORDPOINTS_VERSION */ -define( 'WORDPOINTS_VERSION', '2.4.0' ); +define( 'WORDPOINTS_VERSION', '2.4.1' ); /** * The full path to the plugin's main directory. diff --git a/src/languages/wordpoints-es_ES.mo b/src/languages/wordpoints-es_ES.mo index e067d8b8faf977d6f203b9e1793694269c154279..c2d1a6b1937e05b944c4879095cd1d6716f29963 100755 GIT binary patch delta 28 kcmcb\n" "Language-Team: Spanish 5 star rating." @@ -700,7 +700,7 @@ msgstr "" "Si piensa que WordPoints es maravilloso, permita que todos lo sepan dándole " "una 5 estrellas calificación ." -#: admin/includes/functions.php:2032 +#: admin/includes/functions.php:2033 msgid "" "If you don’t think this plugin deserves 5 stars, please let us know " "how we can improve it." @@ -708,12 +708,12 @@ msgstr "" "Si usted no cree que este plugin se merece 5 estrellas, por favor háganos " "saber cómo podemos mejorarlo." -#: admin/includes/functions.php:2035 +#: admin/includes/functions.php:2036 msgid "Need help?" msgstr "¿Necesita ayuda?" #. translators: URL of WordPoints plugin support forums WordPress.org. -#: admin/includes/functions.php:2042 +#: admin/includes/functions.php:2043 msgid "" "Post your feature request or support question in the support " "forums" @@ -721,99 +721,99 @@ msgstr "" "Publique una solicitud de función o soporte pregunta en el " "foros de soporte " -#: admin/includes/functions.php:2050 +#: admin/includes/functions.php:2051 msgid "Thank you for using WordPoints!" msgstr "¡Gracias por utilizar WordPoints!" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2078 +#: admin/includes/functions.php:2079 msgid "" "WordPoints has deactivated the following extensions because of " "incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2095 +#: admin/includes/functions.php:2096 msgid "" "WordPoints has deactivated the following network-active extensions because " "of incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2114 +#: admin/includes/functions.php:2115 msgid "" "WordPoints has deactivated the following extensions on this site because of " "incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2153 +#: admin/includes/functions.php:2154 msgid "" "WordPoints has deactivated the following extensions because their features " "have now been merged into WordPoints %1$s: %2$s." msgstr "" -#: admin/includes/functions.php:2159 +#: admin/includes/functions.php:2160 msgid "You can now safely delete these extensions." msgstr "" -#: admin/includes/functions.php:2172 +#: admin/includes/functions.php:2173 msgid "Delete Unneeded Extensions" msgstr "" -#: admin/includes/functions.php:2476 +#: admin/includes/functions.php:2477 msgid "" "A WordPoints update is available, but your system is not compatible because " "it is running an outdated version of PHP." msgstr "" #. translators: URL of WordPoints PHP Compatibility docs. -#: admin/includes/functions.php:2482 +#: admin/includes/functions.php:2483 msgid "See the WordPoints user guide for more information." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2616 +#: admin/includes/functions.php:2617 msgid "" "Please fill in your license key for the %s extension for WordPoints, so that " "you can receive updates." msgstr "" -#: admin/includes/functions.php:2619 admin/includes/functions.php:2635 -#: admin/includes/functions.php:2661 admin/includes/functions.php:2673 +#: admin/includes/functions.php:2620 admin/includes/functions.php:2636 +#: admin/includes/functions.php:2662 admin/includes/functions.php:2674 #, fuzzy msgid "WordPoints Extensions screen »" msgstr "WordPoints - %s" #. translators: Extension name. -#: admin/includes/functions.php:2632 +#: admin/includes/functions.php:2633 msgid "" "Your license key for the %s extension for WordPoints appears to be invalid. " "Please enter a valid license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2647 admin/includes/functions.php:2658 +#: admin/includes/functions.php:2648 admin/includes/functions.php:2659 msgid "" "Your license key for the %s extension for WordPoints is expired. Please " "renew your license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2670 +#: admin/includes/functions.php:2671 msgid "" "Your license key for the %s extension for WordPoints is expired. Please " "enter a valid license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2683 +#: admin/includes/functions.php:2684 #, fuzzy msgid "Activate License for %s WordPoints Extension" msgstr "Subir Módulo WordPoints" #. translators: Extension name. -#: admin/includes/functions.php:2693 +#: admin/includes/functions.php:2694 msgid "" "Your license key for the %s extension for WordPoints is not active. Please " "activate it so that you can receive updates." @@ -821,7 +821,7 @@ msgstr "" #. translators: 1. Extension/plugin name; 2. "extension", "plugin", or #. "component". -#: admin/includes/functions.php:2747 +#: admin/includes/functions.php:2748 #, fuzzy msgid "" "WordPoints detected a large network and has skipped part of the installation " @@ -832,7 +832,7 @@ msgstr "" #. translators: 1. Extension/plugin name; 2. "extension", "plugin", or #. "component"; 3. Version number. -#: admin/includes/functions.php:2750 +#: admin/includes/functions.php:2751 #, fuzzy msgid "" "WordPoints detected a large network and has skipped part of the update " @@ -842,21 +842,21 @@ msgstr "" "WordPoints a detectado una red amplia y a saltado parte del proceso de " "actualización para la versión %s (y posiblemente versiones posteriores)." -#: admin/includes/functions.php:2772 +#: admin/includes/functions.php:2773 #, fuzzy msgid "(extension)" msgstr "Versión" -#: admin/includes/functions.php:2776 +#: admin/includes/functions.php:2777 #, fuzzy msgid "(component)" msgstr "Componente" -#: admin/includes/functions.php:2780 +#: admin/includes/functions.php:2781 msgid "(plugin)" msgstr "" -#: admin/includes/functions.php:2804 +#: admin/includes/functions.php:2805 #, fuzzy msgid "" "The rest of the process needs to be completed manually. If this has not been " @@ -865,7 +865,7 @@ msgstr "" "El resto del proceso necesita completarse manualmente. Si no lo ha hecho " "todavía, algunas opciones del plugin podrían no funcionar apropiadamente." -#: admin/includes/functions.php:2805 +#: admin/includes/functions.php:2806 msgid "Learn more." msgstr "Aprenda mas." diff --git a/src/languages/wordpoints-lt.mo b/src/languages/wordpoints-lt.mo index 10e4667fc899a8ba2a1bf7a8549ca0a24cae4b02..efc242528f5c428a7682999a53846b3a7d9a54dd 100644 GIT binary patch delta 26 hcmaE&@I+yQ2PdzguA!lVk)f4|k(H6@=1@+4b^vS;2EqUU delta 26 hcmaE&@I+yQ2PdzAu92yNk%5(=xs|EG=1@+4b^vTd2E_mX diff --git a/src/languages/wordpoints-lt.po b/src/languages/wordpoints-lt.po index c1002f75..f56a8d07 100644 --- a/src/languages/wordpoints-lt.po +++ b/src/languages/wordpoints-lt.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: WordPoints 1.10.0\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wordpoints\n" -"POT-Creation-Date: 2017-10-25 20:17:50+00:00\n" +"POT-Creation-Date: 2017-11-11 21:42:25+00:00\n" "PO-Revision-Date: 2015-06-22 19:24+0200\n" "Last-Translator: Rimantas \n" "Language-Team: Lithuanian 5 star rating." msgstr "" -#: admin/includes/functions.php:2032 +#: admin/includes/functions.php:2033 msgid "" "If you don’t think this plugin deserves 5 stars, please let us know " "how we can improve it." @@ -681,110 +681,110 @@ msgstr "" "Jei manote, kad šis įskiepis nevertas 5 žvaigždučių, prašome mums pranešti, " "kaip galėtumėme jį pagerinti." -#: admin/includes/functions.php:2035 +#: admin/includes/functions.php:2036 msgid "Need help?" msgstr "Ar reikia pagalbos?" #. translators: URL of WordPoints plugin support forums WordPress.org. -#: admin/includes/functions.php:2042 +#: admin/includes/functions.php:2043 msgid "" "Post your feature request or support question in the support " "forums" msgstr "Skelbkite savo prašymus ir klausimus support forums" -#: admin/includes/functions.php:2050 +#: admin/includes/functions.php:2051 msgid "Thank you for using WordPoints!" msgstr "Ačiū, kad naudojatės WordPoints!" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2078 +#: admin/includes/functions.php:2079 msgid "" "WordPoints has deactivated the following extensions because of " "incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2095 +#: admin/includes/functions.php:2096 msgid "" "WordPoints has deactivated the following network-active extensions because " "of incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2114 +#: admin/includes/functions.php:2115 msgid "" "WordPoints has deactivated the following extensions on this site because of " "incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2153 +#: admin/includes/functions.php:2154 msgid "" "WordPoints has deactivated the following extensions because their features " "have now been merged into WordPoints %1$s: %2$s." msgstr "" -#: admin/includes/functions.php:2159 +#: admin/includes/functions.php:2160 msgid "You can now safely delete these extensions." msgstr "" -#: admin/includes/functions.php:2172 +#: admin/includes/functions.php:2173 msgid "Delete Unneeded Extensions" msgstr "" -#: admin/includes/functions.php:2476 +#: admin/includes/functions.php:2477 msgid "" "A WordPoints update is available, but your system is not compatible because " "it is running an outdated version of PHP." msgstr "" #. translators: URL of WordPoints PHP Compatibility docs. -#: admin/includes/functions.php:2482 +#: admin/includes/functions.php:2483 msgid "See the WordPoints user guide for more information." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2616 +#: admin/includes/functions.php:2617 msgid "" "Please fill in your license key for the %s extension for WordPoints, so that " "you can receive updates." msgstr "" -#: admin/includes/functions.php:2619 admin/includes/functions.php:2635 -#: admin/includes/functions.php:2661 admin/includes/functions.php:2673 +#: admin/includes/functions.php:2620 admin/includes/functions.php:2636 +#: admin/includes/functions.php:2662 admin/includes/functions.php:2674 #, fuzzy msgid "WordPoints Extensions screen »" msgstr "WordPoints - Moduliai" #. translators: Extension name. -#: admin/includes/functions.php:2632 +#: admin/includes/functions.php:2633 msgid "" "Your license key for the %s extension for WordPoints appears to be invalid. " "Please enter a valid license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2647 admin/includes/functions.php:2658 +#: admin/includes/functions.php:2648 admin/includes/functions.php:2659 msgid "" "Your license key for the %s extension for WordPoints is expired. Please " "renew your license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2670 +#: admin/includes/functions.php:2671 msgid "" "Your license key for the %s extension for WordPoints is expired. Please " "enter a valid license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2683 +#: admin/includes/functions.php:2684 #, fuzzy msgid "Activate License for %s WordPoints Extension" msgstr "Įkrauti WordPoints modulį" #. translators: Extension name. -#: admin/includes/functions.php:2693 +#: admin/includes/functions.php:2694 msgid "" "Your license key for the %s extension for WordPoints is not active. Please " "activate it so that you can receive updates." @@ -792,7 +792,7 @@ msgstr "" #. translators: 1. Extension/plugin name; 2. "extension", "plugin", or #. "component". -#: admin/includes/functions.php:2747 +#: admin/includes/functions.php:2748 msgid "" "WordPoints detected a large network and has skipped part of the installation " "process for “%1$s” %2$s." @@ -800,28 +800,28 @@ msgstr "" #. translators: 1. Extension/plugin name; 2. "extension", "plugin", or #. "component"; 3. Version number. -#: admin/includes/functions.php:2750 +#: admin/includes/functions.php:2751 msgid "" "WordPoints detected a large network and has skipped part of the update " "process for “%1$s” %2$s for version %3$s (and possibly later " "versions)." msgstr "" -#: admin/includes/functions.php:2772 +#: admin/includes/functions.php:2773 #, fuzzy msgid "(extension)" msgstr "Versija" -#: admin/includes/functions.php:2776 +#: admin/includes/functions.php:2777 #, fuzzy msgid "(component)" msgstr "Komponentas" -#: admin/includes/functions.php:2780 +#: admin/includes/functions.php:2781 msgid "(plugin)" msgstr "" -#: admin/includes/functions.php:2804 +#: admin/includes/functions.php:2805 #, fuzzy msgid "" "The rest of the process needs to be completed manually. If this has not been " @@ -830,7 +830,7 @@ msgstr "" "Likusi proceso dalis turi būti užbaigta rankiniu būdu. Jei tai nepadaryta, " "kai kurios įskiepio dalys gali funkcionuoti nepilnai." -#: admin/includes/functions.php:2805 +#: admin/includes/functions.php:2806 msgid "Learn more." msgstr "Sužinokite daugiau." diff --git a/src/languages/wordpoints-pt_BR.mo b/src/languages/wordpoints-pt_BR.mo index b5810b1736673037697c40b7a64bebadb1452a26..6d8cfae0d4f2ef31ee3d0b8a33153a2aadbf9d4d 100644 GIT binary patch delta 28 jcmeBJ#MrTjaf7!Juc5A?p@Na2m5Gs+k?H0LqYZKZdwd8W delta 28 jcmeBJ#MrTjaf7!JuYs\n" "Language-Team: Portuguese (Brazil) 5 star rating." @@ -693,7 +693,7 @@ msgstr "" "Se você acha que WordPoints é incrível, deixe todos saberem dando a ele 5 estrelas." -#: admin/includes/functions.php:2032 +#: admin/includes/functions.php:2033 msgid "" "If you don’t think this plugin deserves 5 stars, please let us know " "how we can improve it." @@ -701,110 +701,110 @@ msgstr "" "Se você não acredita que este plugin merece 5 estrelas, por favor deixe-nos " "saber como podemos melhorá-lo." -#: admin/includes/functions.php:2035 +#: admin/includes/functions.php:2036 msgid "Need help?" msgstr "Precisa de Ajuda?" #. translators: URL of WordPoints plugin support forums WordPress.org. -#: admin/includes/functions.php:2042 +#: admin/includes/functions.php:2043 msgid "" "Post your feature request or support question in the support " "forums" msgstr "Poste sua melhoria ou dúvida no Fórum de Suporte" -#: admin/includes/functions.php:2050 +#: admin/includes/functions.php:2051 msgid "Thank you for using WordPoints!" msgstr "Obrigado por usar WordPoints!" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2078 +#: admin/includes/functions.php:2079 msgid "" "WordPoints has deactivated the following extensions because of " "incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2095 +#: admin/includes/functions.php:2096 msgid "" "WordPoints has deactivated the following network-active extensions because " "of incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2114 +#: admin/includes/functions.php:2115 msgid "" "WordPoints has deactivated the following extensions on this site because of " "incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2153 +#: admin/includes/functions.php:2154 msgid "" "WordPoints has deactivated the following extensions because their features " "have now been merged into WordPoints %1$s: %2$s." msgstr "" -#: admin/includes/functions.php:2159 +#: admin/includes/functions.php:2160 msgid "You can now safely delete these extensions." msgstr "" -#: admin/includes/functions.php:2172 +#: admin/includes/functions.php:2173 msgid "Delete Unneeded Extensions" msgstr "" -#: admin/includes/functions.php:2476 +#: admin/includes/functions.php:2477 msgid "" "A WordPoints update is available, but your system is not compatible because " "it is running an outdated version of PHP." msgstr "" #. translators: URL of WordPoints PHP Compatibility docs. -#: admin/includes/functions.php:2482 +#: admin/includes/functions.php:2483 msgid "See the WordPoints user guide for more information." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2616 +#: admin/includes/functions.php:2617 msgid "" "Please fill in your license key for the %s extension for WordPoints, so that " "you can receive updates." msgstr "" -#: admin/includes/functions.php:2619 admin/includes/functions.php:2635 -#: admin/includes/functions.php:2661 admin/includes/functions.php:2673 +#: admin/includes/functions.php:2620 admin/includes/functions.php:2636 +#: admin/includes/functions.php:2662 admin/includes/functions.php:2674 #, fuzzy msgid "WordPoints Extensions screen »" msgstr "WordPoints - %s" #. translators: Extension name. -#: admin/includes/functions.php:2632 +#: admin/includes/functions.php:2633 msgid "" "Your license key for the %s extension for WordPoints appears to be invalid. " "Please enter a valid license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2647 admin/includes/functions.php:2658 +#: admin/includes/functions.php:2648 admin/includes/functions.php:2659 msgid "" "Your license key for the %s extension for WordPoints is expired. Please " "renew your license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2670 +#: admin/includes/functions.php:2671 msgid "" "Your license key for the %s extension for WordPoints is expired. Please " "enter a valid license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2683 +#: admin/includes/functions.php:2684 #, fuzzy msgid "Activate License for %s WordPoints Extension" msgstr "Faça upload do Modulo WordPoints" #. translators: Extension name. -#: admin/includes/functions.php:2693 +#: admin/includes/functions.php:2694 msgid "" "Your license key for the %s extension for WordPoints is not active. Please " "activate it so that you can receive updates." @@ -812,7 +812,7 @@ msgstr "" #. translators: 1. Extension/plugin name; 2. "extension", "plugin", or #. "component". -#: admin/includes/functions.php:2747 +#: admin/includes/functions.php:2748 msgid "" "WordPoints detected a large network and has skipped part of the installation " "process for “%1$s” %2$s." @@ -820,34 +820,34 @@ msgstr "" #. translators: 1. Extension/plugin name; 2. "extension", "plugin", or #. "component"; 3. Version number. -#: admin/includes/functions.php:2750 +#: admin/includes/functions.php:2751 msgid "" "WordPoints detected a large network and has skipped part of the update " "process for “%1$s” %2$s for version %3$s (and possibly later " "versions)." msgstr "" -#: admin/includes/functions.php:2772 +#: admin/includes/functions.php:2773 #, fuzzy msgid "(extension)" msgstr "Versão" -#: admin/includes/functions.php:2776 +#: admin/includes/functions.php:2777 #, fuzzy msgid "(component)" msgstr "Componente" -#: admin/includes/functions.php:2780 +#: admin/includes/functions.php:2781 msgid "(plugin)" msgstr "" -#: admin/includes/functions.php:2804 +#: admin/includes/functions.php:2805 msgid "" "The rest of the process needs to be completed manually. If this has not been " "done already, some features may not function properly." msgstr "" -#: admin/includes/functions.php:2805 +#: admin/includes/functions.php:2806 msgid "Learn more." msgstr "" diff --git a/src/languages/wordpoints.pot b/src/languages/wordpoints.pot index a3d72b16..60a5df53 100644 --- a/src/languages/wordpoints.pot +++ b/src/languages/wordpoints.pot @@ -2,9 +2,9 @@ # This file is distributed under the same license as the WordPoints package. msgid "" msgstr "" -"Project-Id-Version: WordPoints 2.4.0\n" +"Project-Id-Version: WordPoints 2.4.1\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wordpoints\n" -"POT-Creation-Date: 2017-10-25 20:17:50+00:00\n" +"POT-Creation-Date: 2017-11-11 21:42:25+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -148,7 +148,7 @@ msgstr "" #. translators: Extension name. #: admin/classes/list/table/extensions.php:751 -#: admin/includes/functions.php:1871 +#: admin/includes/functions.php:1872 msgid "Select %s" msgstr "" @@ -201,7 +201,7 @@ msgstr "" msgid "Activate %s" msgstr "" -#. #-#-#-#-# wordpoints.pot (WordPoints 2.4.0) #-#-#-#-# +#. #-#-#-#-# wordpoints.pot (WordPoints 2.4.1) #-#-#-#-# #. Plugin Name of the plugin/theme #: admin/includes/functions.php:69 #: components/points/admin/includes/functions.php:340 @@ -425,7 +425,7 @@ msgstr "" #: admin/includes/functions.php:1069 admin/includes/functions.php:1109 #: admin/includes/functions.php:1164 admin/includes/functions.php:1209 -#: admin/includes/functions.php:1738 +#: admin/includes/functions.php:1739 msgid "" "Sorry, you are not allowed to update WordPoints extensions for this site." msgstr "" @@ -483,259 +483,259 @@ msgid "License activated." msgstr "" #. translators: Error message. -#: admin/includes/functions.php:1468 +#: admin/includes/functions.php:1469 msgid "Sorry, there was an error while trying to activate the license: %s" msgstr "" -#: admin/includes/functions.php:1470 +#: admin/includes/functions.php:1471 msgid "That license key is invalid." msgstr "" -#: admin/includes/functions.php:1475 admin/includes/functions.php:1479 +#: admin/includes/functions.php:1476 admin/includes/functions.php:1480 msgid "Sorry, that license key is expired, and must be renewed." msgstr "" -#: admin/includes/functions.php:1476 admin/includes/functions.php:1712 -#: admin/includes/functions.php:2650 +#: admin/includes/functions.php:1477 admin/includes/functions.php:1713 +#: admin/includes/functions.php:2651 msgid "Renew License" msgstr "" -#: admin/includes/functions.php:1482 +#: admin/includes/functions.php:1483 msgid "Sorry, that license key is expired." msgstr "" -#: admin/includes/functions.php:1487 +#: admin/includes/functions.php:1488 msgid "Sorry, that license key cannot be activated." msgstr "" -#: admin/includes/functions.php:1510 +#: admin/includes/functions.php:1511 msgid "License deactivated." msgstr "" #. translators: Error message. -#: admin/includes/functions.php:1513 +#: admin/includes/functions.php:1514 msgid "Sorry, there was an error while trying to deactivate the license: %s" msgstr "" -#: admin/includes/functions.php:1515 +#: admin/includes/functions.php:1516 msgid "" "Sorry, there was an unknown error while trying to deactivate that license " "key." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:1658 +#: admin/includes/functions.php:1659 msgid "License key for %s" msgstr "" -#: admin/includes/functions.php:1666 +#: admin/includes/functions.php:1667 msgid "License key:" msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:1684 +#: admin/includes/functions.php:1685 msgid "Deactivate License for %s" msgstr "" -#: admin/includes/functions.php:1687 +#: admin/includes/functions.php:1688 msgid "Deactivate License" msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:1695 +#: admin/includes/functions.php:1696 msgid "Activate License for %s" msgstr "" -#: admin/includes/functions.php:1698 admin/includes/functions.php:2715 +#: admin/includes/functions.php:1699 admin/includes/functions.php:2716 msgid "Activate License" msgstr "" -#: admin/includes/functions.php:1704 +#: admin/includes/functions.php:1705 msgid "This license key is expired and must be renewed." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:1709 +#: admin/includes/functions.php:1710 msgid "Renew License for %s" msgstr "" -#: admin/includes/functions.php:1715 +#: admin/includes/functions.php:1716 msgid "This license key is expired." msgstr "" -#: admin/includes/functions.php:1742 +#: admin/includes/functions.php:1743 msgid "No extension supplied." msgstr "" -#: admin/includes/functions.php:1750 +#: admin/includes/functions.php:1751 msgid "That extension does not exist." msgstr "" -#: admin/includes/functions.php:1756 +#: admin/includes/functions.php:1757 msgid "There is no server specified for this extension." msgstr "" -#: admin/includes/functions.php:1762 +#: admin/includes/functions.php:1763 msgid "The server for this extension uses an unsupported API." msgstr "" -#: admin/includes/functions.php:1833 admin/screens/modules.php:159 +#: admin/includes/functions.php:1834 admin/screens/modules.php:159 msgid "WordPoints Extensions" msgstr "" -#: admin/includes/functions.php:1836 +#: admin/includes/functions.php:1837 msgid "Your extensions are all up to date." msgstr "" -#: admin/includes/functions.php:1840 +#: admin/includes/functions.php:1841 msgid "" "The following extensions have new versions available. Check the ones you " "want to update and then click “Update Extensions”." msgstr "" -#: admin/includes/functions.php:1845 admin/includes/functions.php:1925 +#: admin/includes/functions.php:1846 admin/includes/functions.php:1926 msgid "Update Extensions" msgstr "" -#: admin/includes/functions.php:1854 admin/includes/functions.php:1920 +#: admin/includes/functions.php:1855 admin/includes/functions.php:1921 msgid "Select All" msgstr "" #. translators: 1. Installed version number; 2. Update version number. -#: admin/includes/functions.php:1888 +#: admin/includes/functions.php:1889 msgid "You have version %1$s installed. Update to %2$s." msgstr "" #. translators: Version number. -#: admin/includes/functions.php:1901 +#: admin/includes/functions.php:1902 msgid "View version %1$s details." msgstr "" -#: admin/includes/functions.php:1987 +#: admin/includes/functions.php:1988 msgid "" "This appears to be a WordPoints extension archive. Try installing it on the " "WordPoints extension install screen instead." msgstr "" -#: admin/includes/functions.php:2017 +#: admin/includes/functions.php:2018 msgid "Like this plugin?" msgstr "" #. translators: URL for leaving a review of WordPoints on WordPress.org. -#: admin/includes/functions.php:2024 +#: admin/includes/functions.php:2025 msgid "" "If you think WordPoints is great, let everyone know by giving it a 5 star rating." msgstr "" -#: admin/includes/functions.php:2032 +#: admin/includes/functions.php:2033 msgid "" "If you don’t think this plugin deserves 5 stars, please let us know " "how we can improve it." msgstr "" -#: admin/includes/functions.php:2035 +#: admin/includes/functions.php:2036 msgid "Need help?" msgstr "" #. translators: URL of WordPoints plugin support forums WordPress.org. -#: admin/includes/functions.php:2042 +#: admin/includes/functions.php:2043 msgid "" "Post your feature request or support question in the support " "forums" msgstr "" -#: admin/includes/functions.php:2050 +#: admin/includes/functions.php:2051 msgid "Thank you for using WordPoints!" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2078 +#: admin/includes/functions.php:2079 msgid "" "WordPoints has deactivated the following extensions because of " "incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2095 +#: admin/includes/functions.php:2096 msgid "" "WordPoints has deactivated the following network-active extensions because " "of incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2114 +#: admin/includes/functions.php:2115 msgid "" "WordPoints has deactivated the following extensions on this site because of " "incompatibilities with WordPoints %1$s: %2$s" msgstr "" #. translators: 1. Plugin version; 2. List of extensions. -#: admin/includes/functions.php:2153 +#: admin/includes/functions.php:2154 msgid "" "WordPoints has deactivated the following extensions because their features " "have now been merged into WordPoints %1$s: %2$s." msgstr "" -#: admin/includes/functions.php:2159 +#: admin/includes/functions.php:2160 msgid "You can now safely delete these extensions." msgstr "" -#: admin/includes/functions.php:2172 +#: admin/includes/functions.php:2173 msgid "Delete Unneeded Extensions" msgstr "" -#: admin/includes/functions.php:2476 +#: admin/includes/functions.php:2477 msgid "" "A WordPoints update is available, but your system is not compatible because " "it is running an outdated version of PHP." msgstr "" #. translators: URL of WordPoints PHP Compatibility docs. -#: admin/includes/functions.php:2482 +#: admin/includes/functions.php:2483 msgid "See the WordPoints user guide for more information." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2616 +#: admin/includes/functions.php:2617 msgid "" "Please fill in your license key for the %s extension for WordPoints, so that " "you can receive updates." msgstr "" -#: admin/includes/functions.php:2619 admin/includes/functions.php:2635 -#: admin/includes/functions.php:2661 admin/includes/functions.php:2673 +#: admin/includes/functions.php:2620 admin/includes/functions.php:2636 +#: admin/includes/functions.php:2662 admin/includes/functions.php:2674 msgid "WordPoints Extensions screen »" msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2632 +#: admin/includes/functions.php:2633 msgid "" "Your license key for the %s extension for WordPoints appears to be invalid. " "Please enter a valid license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2647 admin/includes/functions.php:2658 +#: admin/includes/functions.php:2648 admin/includes/functions.php:2659 msgid "" "Your license key for the %s extension for WordPoints is expired. Please " "renew your license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2670 +#: admin/includes/functions.php:2671 msgid "" "Your license key for the %s extension for WordPoints is expired. Please " "enter a valid license key so that you can receive updates." msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2683 +#: admin/includes/functions.php:2684 msgid "Activate License for %s WordPoints Extension" msgstr "" #. translators: Extension name. -#: admin/includes/functions.php:2693 +#: admin/includes/functions.php:2694 msgid "" "Your license key for the %s extension for WordPoints is not active. Please " "activate it so that you can receive updates." @@ -743,7 +743,7 @@ msgstr "" #. translators: 1. Extension/plugin name; 2. "extension", "plugin", or #. "component". -#: admin/includes/functions.php:2747 +#: admin/includes/functions.php:2748 msgid "" "WordPoints detected a large network and has skipped part of the installation " "process for “%1$s” %2$s." @@ -751,32 +751,32 @@ msgstr "" #. translators: 1. Extension/plugin name; 2. "extension", "plugin", or #. "component"; 3. Version number. -#: admin/includes/functions.php:2750 +#: admin/includes/functions.php:2751 msgid "" "WordPoints detected a large network and has skipped part of the update " "process for “%1$s” %2$s for version %3$s (and possibly later " "versions)." msgstr "" -#: admin/includes/functions.php:2772 +#: admin/includes/functions.php:2773 msgid "(extension)" msgstr "" -#: admin/includes/functions.php:2776 +#: admin/includes/functions.php:2777 msgid "(component)" msgstr "" -#: admin/includes/functions.php:2780 +#: admin/includes/functions.php:2781 msgid "(plugin)" msgstr "" -#: admin/includes/functions.php:2804 +#: admin/includes/functions.php:2805 msgid "" "The rest of the process needs to be completed manually. If this has not been " "done already, some features may not function properly." msgstr "" -#: admin/includes/functions.php:2805 +#: admin/includes/functions.php:2806 msgid "Learn more." msgstr "" diff --git a/src/readme.txt b/src/readme.txt index 8c22c9fe..d9dc0fa8 100644 --- a/src/readme.txt +++ b/src/readme.txt @@ -3,8 +3,8 @@ Contributors: jdgrimes Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=TPXS6B98HURLJ&lc=US&item_name=WordPoints&item_number=wordpressorg¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted Tags: points, awards, rewards, credits, gamify, ranks, games Requires at least: 4.7 -Tested up to: 4.9-beta4-42020 -Stable tag: 2.4.0 +Tested up to: 4.9 +Stable tag: 2.4.1 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html @@ -94,6 +94,14 @@ screens. This plugin adheres to [Semantic Versioning](http://semver.org/). += 2.4.1 — 2017-11-13 = + +##### Fixed + +- Fatal errors when a rank type was not recognized. This should usually never happen. +- More fatal errors when viewing the points logs after deactivating BuddyPress. +- "Update package not found" errors when attempting to update an extension. + = 2.4.0 — 2017-10-26 = **Requires: WordPress 4.7+** @@ -187,6 +195,9 @@ If you'd like to view the changelog for older versions, see the [changelog.txt]( == Upgrade Notice == += 2.4.1 = +Fixes a few errors that occurred under rare circumstances. + = 2.4.0 = Adds support for extension updates, a shortcode to display available ranks, the ability to award points based on post terms, and also improves performance when diff --git a/src/wordpoints.php b/src/wordpoints.php index 6160159b..a45bbb15 100644 --- a/src/wordpoints.php +++ b/src/wordpoints.php @@ -4,7 +4,7 @@ * Plugin Name: WordPoints * Plugin URI: https://wordpoints.org/ * Description: Create one or more points systems for your site, and reward user activity. - * Version: 2.4.0 + * Version: 2.4.1 * Author: J.D. Grimes * Author URI: https://codesymphony.co/ * License: GPLv2 @@ -40,7 +40,7 @@ * * @package WordPoints * @author J.D. Grimes - * @version 2.4.0 + * @version 2.4.1 * @license https://opensource.org/licenses/gpl-license.php GPL, version 2 or later. * @copyright 2013-17 J.D. Grimes */