Skip to content

Release #963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vytisbulkevicius merged 5 commits into from
Nov 17, 2022
Merged

Release #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
498b020
Sync branch [skip ci]
pirate-bot Nov 10, 2022
3826a12
Sync branch [skip ci]
pirate-bot Nov 10, 2022
7a6604d
Fix PHP error when polylang plugin activated #960
girishpanchal30 Nov 15, 2022
60c1b89
e2e: fix invisible element error #960
girishpanchal30 Nov 15, 2022
b70478d
Merge pull request #961 from Codeinwp/bugfix/960
vytisbulkevicius Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions classes/Visualizer/Module/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,8 +768,8 @@ function setScreenOptions( $status, $option, $value ) {
*/
private function getDisplayFilters( &$query_args ) {
$query = array();

if ( Visualizer_Module::is_pro() && function_exists( 'icl_get_languages' ) ) {
global $sitepress;
if ( Visualizer_Module::is_pro() && ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) ) {
$current_lang = icl_get_current_language();
if ( in_array( $current_lang, array( 'all', icl_get_default_language() ), true ) ) {
$query[] = array(
Expand Down Expand Up @@ -1138,16 +1138,15 @@ public static function proFeaturesLocked() {
* @return bool Default false
*/
public function addMultilingualSupport( $chart_id ) {
global $sitepress;
if ( Visualizer_Module::is_pro() ) {
return;
}
if ( function_exists( 'icl_get_languages' ) ) {
if ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) {
$language = icl_get_languages();
$current_lang = icl_get_current_language();
$default_lang = icl_get_default_language();
$post_info = wpml_get_language_information( null, $chart_id );

global $sitepress;
$translations = array();
if ( ! empty( $post_info ) && ( $default_lang === $post_info['language_code'] ) ) {
$trid = $sitepress->get_element_trid( $chart_id, 'post_' . Visualizer_Plugin::CPT_VISUALIZER );
Expand Down
4 changes: 2 additions & 2 deletions classes/Visualizer/Module/Chart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ public function deleteChart() {
}
}
if ( $success ) {
if ( Visualizer_Module::is_pro() && function_exists( 'icl_get_languages' ) ) {
global $sitepress;
global $sitepress;
if ( Visualizer_Module::is_pro() && ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) ) {
$trid = $sitepress->get_element_trid( $chart_id, 'post_' . Visualizer_Plugin::CPT_VISUALIZER );
$translations = $sitepress->get_element_translations( $trid );
if ( ! empty( $translations ) ) {
Expand Down
3 changes: 2 additions & 1 deletion classes/Visualizer/Module/Frontend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,8 @@ public function renderChart( $atts ) {
$atts
);

if ( Visualizer_Module::is_pro() && function_exists( 'icl_get_languages' ) ) {
global $sitepress;
if ( Visualizer_Module::is_pro() && ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) ) {
global $sitepress;
$locale = icl_get_current_language();
$locale = strtolower( str_replace( '_', '-', $locale ) );
Expand Down
3 changes: 2 additions & 1 deletion cypress/integration/gutenberg-datatable/free-gutenberg-datatable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ describe('Test Free - gutenberg (datatable)', function() {
it('Verify insertion of charts', function() {
cy.visit('/wp-admin/post-new.php');

cy.clear_welcome();
// get rid of that irritating popup
cy.get('.edit-post-welcome-guide .components-modal__header button').click();

var charts = Array.from({ length: 1 }, function(_item, index) {
return index + 1;
Expand Down
3 changes: 2 additions & 1 deletion cypress/integration/gutenberg/free-gutenberg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ describe('Test Free - gutenberg', function() {
it('Verify insertion of charts', function() {
cy.visit('/wp-admin/post-new.php');

cy.clear_welcome();
// get rid of that irritating popup
cy.get('.edit-post-welcome-guide .components-modal__header button').click();

var charts = Array.from({ length: parseInt(Cypress.env('chart_types').free - 1) }, function(_item, index) {
return index + 1;
Expand Down