2.9.1.2

- [PARTIALLY REVERTED] Improved activation process in case qTranslate or another fork is already active (missing functions for plugin dependencies)
chsxf · Jan 2, 2015 · 3fcb104 · 3fcb104
1 parent 01ef873
commit 3fcb104
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Contributors: chsxf, michel.weimerskirch
 Tags: multilingual, language, admin, tinymce, bilingual, widget, switcher, i18n, l10n, multilanguage, professional, translation, service, human  
 Requires at least: 3.9  
 Tested up to: 4.1  
-Stable tag: 2.9.1.1
+Stable tag: 2.9.1.2
 Donate Link: http://www.xhaleera.com/  
 License: GPLv2
 
@@ -75,6 +75,10 @@ For Problems with mqTranslate-specific features, visits [our Support Page](http:
 Changelog
 ---------
 
+2.9.1.2:
+
+- [PARTIALLY REVERTED] Improved activation process in case qTranslate or another fork is already active (missing functions for plugin dependencies)
+
 2.9.1.1:
 
 - [REVERTED] Added client-side cookie to memorize language selection (this feature created a bug in qtranslate slug)

diff --git a/mqtranslate.php b/mqtranslate.php
@@ -3,7 +3,7 @@
 Plugin Name: mqTranslate
 Plugin URI: http://wordpress.org/plugins/mqtranslate/
 Description: Adds userfriendly multilingual content support into Wordpress. mqTranslate is a fork of the well-known <a href="http://www.qianqin.de/mqtranslate/">qTranslate</a> plugin by <a href="http://www.qianqin.de/">Qian Qin</a>, extending the original software with collaborative and team-oriented features.
-Version: 2.9.1.1
+Version: 2.9.1.2
 Author: xhaleera
 Author URI: http://www.xhaleera.com
 Tags: multilingual, multi, language, admin, tinymce, mqTranslate, Polyglot, bilingual, widget, switcher, professional, human, translation, service
@@ -500,7 +500,7 @@ function mqtranslate_activation_check() {
 // Optimisation settings
 $q_config['filter_all_options'] = 1;
 
-if (!function_exists('is_plugin_active') || is_plugin_active( 'mqtranslate/mqtranslate.php' )) {
+//if (!function_exists('is_plugin_active') || is_plugin_active( 'mqtranslate/mqtranslate.php' )) {
 	// Load mqTranslate
 	require_once(dirname(__FILE__)."/mqtranslate_javascript.php");
 	require_once(dirname(__FILE__)."/mqtranslate_utils.php");
@@ -517,4 +517,4 @@ function mqtranslate_activation_check() {
 	require_once(dirname(__FILE__)."/mqtranslate_hooks.php");
 
 	require_once(dirname(__FILE__)."/mqtranslate_xhaleera_addons.php");
-}
+//}
diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: chsxf, michel.weimerskirch
 Tags: multilingual, language, admin, tinymce, bilingual, widget, switcher, i18n, l10n, multilanguage, professional, translation, service, human
 Requires at least: 3.9
 Tested up to: 4.1
-Stable tag: 2.9.1.1
+Stable tag: 2.9.1.2
 Donate Link: http://www.xhaleera.com/
 License: GPLv2
 
@@ -77,6 +77,10 @@ For Problems with mqTranslate-specific features, visits [our Support Page](http:
 
 == Changelog ==
 
+2.9.1.2:
+
+- [PARTIALLY REVERTED] Improved activation process in case qTranslate or another fork is already active (missing functions for plugin dependencies)
+
 2.9.1.1:
 
 - [REVERTED] Added client-side cookie to memorize language selection (this feature created a bug in qtranslate slug)