Merge pull request #113 from OpenDevelopmentMekong/master

merging to prod for release of version v2.1.3
OpenDevelopmentMekong · Dec 22, 2016 · f83d7e1 · f83d7e1
2 parents 91b0a52 + ee5a54e
commit f83d7e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/post-types/profile-pages.php b/post-types/profile-pages.php
@@ -141,11 +141,11 @@ public function resource_settings_box($post = false)
           $filtered_by_column_index_localization = get_post_meta($post->ID, '_filtered_by_column_index_localization', true);
           ?>
     		<div id="multiple-site">
-    			<input type="radio" id="csv_en" class="en" name="language_site" value="en" checked />
+    			<input type="radio" id="csv_en" class="en" name="language_site_1" value="en" checked />
     			<label for="csv_en"><?php _e('ENGLISH', 'wp-odm_profile_pages');
             ?></label> &nbsp;
             <?php if (odm_language_manager()->get_the_language_by_site() != "English"): ?>
-              <input type="radio" id="csv_localization" class="localization" name="language_site" value="localization" />
+              <input type="radio" id="csv_localization" class="localization" name="language_site_1" value="localization" />
         			<label for="csv_localization"><?php _e(odm_language_manager()->get_the_language_by_site(), 'wp-odm_profile_pages');?></label>
             <?php endif; ?>
     		</div>
@@ -211,7 +211,7 @@ public function resource_settings_box($post = false)
     			var $forms = $('.language_settings');
     			var showForms = function() {
     				  $forms.hide();
-    					var selected = $('input[type="radio"][name=language_site]').filter(':checked').val();
+    					var selected = $('input[type="radio"][name=language_site_1]').filter(':checked').val();
     					$('.language-' + selected).show();
     			}
     			$languageSelection.on('change', function() {
@@ -265,11 +265,11 @@ public function profiles_page_settings_box($post = false)
             $link_to_detail_column_localization = get_post_meta($post->ID, '_link_to_detail_column_localization', true);
             ?>
           <div id="multiple-site">
-            <input type="radio" id="en" class="en" name="language_site" value="en" checked />
+            <input type="radio" id="en" class="en" name="language_site_2" value="en" checked />
             <label for="en"><?php _e('ENGLISH', 'wp-odm_profile_pages');
                 ?></label> &nbsp;
             <?php if (odm_language_manager()->get_the_language_by_site() != "English"): ?>
-              <input type="radio" id="localization" class="localization" name="language_site" value="localization" />
+              <input type="radio" id="localization" class="localization" name="language_site_2" value="localization" />
               <label for="localization"><?php _e(odm_language_manager()->get_the_language_by_site(), 'wp-odm_profile_pages');?></label>
             <?php endif; ?>
           </div>
@@ -367,7 +367,7 @@ public function profiles_page_settings_box($post = false)
       			var $forms = $('.language_settings');
       			var showForms = function() {
       				  $forms.hide();
-      					var selected = $('input[type="radio"][name=language_site]').filter(':checked').val();
+      					var selected = $('input[type="radio"][name=language_site_2]').filter(':checked').val();
       					$('.language-' + selected).show();
       			}
       			$languageSelection.on('change', function() {
@@ -386,10 +386,10 @@ public function full_width_middle_content_box($post = false)
         $full_width_middle_content_localization = get_post_meta($post->ID, '_full_width_middle_content_localization', true);
         ?>
         <div id="multiple-site">
-          <input type="radio" id="middle_content_en" class="en" name="language_site" value="en" checked />
+          <input type="radio" id="middle_content_en" class="en" name="language_site_3" value="en" checked />
           <label for="middle_content_en"><?php _e('ENGLISH', 'wp-odm_profile_pages'); ?></label> &nbsp;
           <?php if (odm_language_manager()->get_the_language_by_site() != "English"): ?>
-            <input type="radio" id="middle_content_localization" class="localization" name="language_site" value="localization" />
+            <input type="radio" id="middle_content_localization" class="localization" name="language_site_3" value="localization" />
             <label for="middle_content_localization"><?php _e(odm_language_manager()->get_the_language_by_site(), 'wp-odm_profile_pages');  ?></label>
           <?php endif; ?>
 
@@ -438,7 +438,7 @@ public function full_width_middle_content_box($post = false)
     			var $forms = $('.language_settings');
     			var showForms = function() {
     				  $forms.hide();
-    					var selected = $('input[type="radio"][name=language_site]').filter(':checked').val();
+    					var selected = $('input[type="radio"][name=language_site_3]').filter(':checked').val();
     					$('.language-' + selected).show();
     			}
     			$languageSelection.on('change', function() {

diff --git a/wp-odm_profile_pages.php b/wp-odm_profile_pages.php
@@ -3,7 +3,7 @@
  * Plugin Name: ODM Profile Pages
  * Plugin URI: http://github.com/OpenDevelopmentMekong/odm_profile_pages
  * Description: Internal wordpress plugin for exposing custom content type for profile pages
- * Version: 2.1.2
+ * Version: 2.1.3
  * Author: Alex Corbi ([email protected])
  * Author URI: http://www.lifeformapps.com
  * License: GPLv3.