From 9546ac0a6cf2d29a1383d086ff264f3be30f6ea6 Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Thu, 8 Feb 2018 09:42:03 +0200
Subject: [PATCH] - text changes; - fixed issue with WPML;

---
 includes/class-init.php         | 2 +-
 includes/um-short-functions.php | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/includes/class-init.php b/includes/class-init.php
index e39421dc..ad3d68ce 100644
--- a/includes/class-init.php
+++ b/includes/class-init.php
@@ -242,7 +242,7 @@ if ( ! class_exists( 'UM' ) ) {
 			remove_action( 'init', array( $um_woocommerce, 'plugin_check' ), 1 );
 			$um_woocommerce->plugin_inactive = true;*/
 
-			echo '<div class="error"><p>' . sprintf( __( '<strong>ATTENTION!</strong> %s %s requires 2.0 extensions. You have pre 2.0 extensions installed on your site. <br /> Please update %s extensions to latest versions. For more info see this <a href="%s" target="_blank">doc</a>.', 'ultimate-member' ), ultimatemember_plugin_name, ultimatemember_version, ultimatemember_plugin_name, 'http://docs.ultimatemember.com/article/266-updating-to-2-0-versions-of-extensions' ) . '</p></div>';
+			echo '<div class="error"><p>' . sprintf( __( '<strong>%s %s</strong> requires 2.0 extensions. You have pre 2.0 extensions installed on your site. <br /> Please update %s extensions to latest versions. For more info see this <a href="%s" target="_blank">doc</a>.', 'ultimate-member' ), ultimatemember_plugin_name, ultimatemember_version, ultimatemember_plugin_name, 'http://docs.ultimatemember.com/article/266-updating-to-2-0-versions-of-extensions' ) . '</p></div>';
 		}
 
 
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index eed1247d..edee0170 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -671,12 +671,15 @@ function um_is_core_page( $page ) {
 
 	if (isset( $post->ID ) && isset( UM()->config()->permalinks[$page] ) && $post->ID == UM()->config()->permalinks[$page])
 		return true;
+
 	if (isset( $post->ID ) && get_post_meta( $post->ID, '_um_wpml_' . $page, true ) == 1)
 		return true;
 
-	global $sitepress;
-	if ( UM()->config()->permalinks[$page] == wpml_object_id_filter( $post->ID, 'page', true, $sitepress->get_default_language() ) ) {
-		return true;
+	if ( UM()->external_integrations()->is_wpml_active() ) {
+		global $sitepress;
+		if ( UM()->config()->permalinks[$page] == wpml_object_id_filter( $post->ID, 'page', true, $sitepress->get_default_language() ) ) {
+			return true;
+		}
 	}
 
 	if (isset( $post->ID )) {