Adapt code to new MultilingualPress functions. #206

inpsyde · Sep 27, 2016 · 11c254c · 11c254c
1 parent 31740ed
commit 11c254c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/src/inc/Multilingual_Press.php b/src/inc/Multilingual_Press.php
@@ -300,7 +300,7 @@ public function delete_blog( $blog_id ) {
 	 */
 	public function language_attributes( $output ) {
 
-		$site_language = Mlp_Helpers::get_current_blog_language();
+		$site_language = \Inpsyde\MultilingualPress\get_current_site_language();
 		if ( ! $site_language ) {
 			return $output;
 		}

diff --git a/src/inc/feature.language_column.php b/src/inc/feature.language_column.php
@@ -19,7 +19,7 @@ function mlp_feature_language_column() {
 		function ( $id, $site_id ) {
 
 			switch_to_blog( $site_id );
-			$language = (array) Mlp_Helpers::get_current_blog_language();
+			$language = \Inpsyde\MultilingualPress\get_current_site_language();
 			restore_current_blog();
 
 			return '' === $language

diff --git a/src/inc/redirect/Mlp_Redirect_Frontend.php b/src/inc/redirect/Mlp_Redirect_Frontend.php
@@ -92,8 +92,7 @@ public function is_redirectable() {
 		}
 
 		if ( isset( $_SESSION['noredirect'] ) ) {
-			$current_site_language = mlp_get_current_blog_language();
-
+			$current_site_language = \Inpsyde\MultilingualPress\get_current_site_language();
 			if ( in_array( $current_site_language, (array) $_SESSION['noredirect'], true ) ) {
 				return false;
 			}

diff --git a/src/inc/site-settings/Mlp_Network_Site_Settings_Tab_Content.php b/src/inc/site-settings/Mlp_Network_Site_Settings_Tab_Content.php
@@ -247,7 +247,7 @@ private function show_blog_relationships( $site_option ) {
 								type="checkbox" name="related_blogs[]" value="<?php echo esc_attr( $blog_id ) ?>" />
 							<?php echo esc_html( $blog_name ); ?>
 							-
-							<?php echo esc_html( Mlp_Helpers::get_blog_language( $blog_id, false ) ); ?>
+							<?php echo esc_html( \Inpsyde\MultilingualPress\get_site_language( $blog_id, false ) ); ?>
 						</label>
 					</p>
 					<?php

diff --git a/src/inc/site-settings/Mlp_New_Site_View.php b/src/inc/site-settings/Mlp_New_Site_View.php
@@ -193,7 +193,7 @@ private function render_relationships() {
 						id="<?php echo esc_attr( $id ); ?>">
 					<?php echo esc_html( $blog_name ); ?>
 					-
-					<?php echo esc_html( Mlp_Helpers::get_blog_language( $site_id, false ) ); ?>
+					<?php echo esc_html( \Inpsyde\MultilingualPress\get_site_language( $site_id, false ) ); ?>
 				</label>
 			</p>
 			<?php