From 3d36e980af8e30b77203c2b60f4e7c00174f9adf Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@g-u-i.net>
Date: Thu, 5 Dec 2013 15:35:14 +0100
Subject: [PATCH] json.return IE bug fixe suite + misc

---
 materio_flag.pages.inc                           | 8 ++++----
 materio_search_api.module                        | 3 ++-
 materio_search_api_ajax.pages.inc                | 5 ++---
 templates/materio-didactique-home-block.tpl.php  | 4 ++--
 templates/materio-flag-mybookmarks-block.tpl.php | 3 ++-
 templates/materio-search-api-actuality.tpl.php   | 3 ++-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/materio_flag.pages.inc b/materio_flag.pages.inc
index 5e4d51f9..65112aab 100755
--- a/materio_flag.pages.inc
+++ b/materio_flag.pages.inc
@@ -118,7 +118,7 @@ function materio_flag_createlist_form($type){
   $return = drupal_render($form); 
 
   $rep = array(
-    'return'=>$return,
+    'rendered_form'=>$return,
   );
   
   if ($debug) {
@@ -217,7 +217,7 @@ function materio_flag_editlist_form($type, $fid){
     $return = drupal_render($form); 
 
     $rep = array(
-      'return'=>$return,
+      'rendered_form'=>$return,
     );
   }else{
     $rep = array(
@@ -478,11 +478,11 @@ function materio_flag_ajax_list($fid, $page = 0){
   } elseif (isset($return)) {
 
     if (is_array($return)) {
-      $return = drupal_render($return);
+      $rendered = drupal_render($return);
     }
       
     $rep = array(
-      'return' => $return,
+      'rendered' => $rendered,
       'path' => $path,
       'title' => drupal_get_title(),
     );
diff --git a/materio_search_api.module b/materio_search_api.module
index 0232962b..0b41b1a3 100755
--- a/materio_search_api.module
+++ b/materio_search_api.module
@@ -756,4 +756,5 @@ function materio_search_api_block_view_alter(&$data, $block) {
       }
     }
   }
-}
\ No newline at end of file
+}
+
diff --git a/materio_search_api_ajax.pages.inc b/materio_search_api_ajax.pages.inc
index 69849b47..37042677 100755
--- a/materio_search_api_ajax.pages.inc
+++ b/materio_search_api_ajax.pages.inc
@@ -105,7 +105,7 @@ function materio_search_api_ajax_search($page = 0){
       'keys'=>$keys,
       'keys_encoded'=>$keys_encoded,
       'search_path'=>$search_path,
-      'return'=>$return,
+      'returned'=>$return,
       'active_types'=>$active_types,
       'title' => drupal_get_title(),
     );
@@ -121,7 +121,6 @@ function materio_search_api_ajax_search($page = 0){
     }
     
   }
-
 }
 
 
@@ -208,7 +207,7 @@ function materio_search_api_ajax_actuality($page = 0){
       
     $rep = array(
       'path' => $path,
-      'return'=>$return,
+      'returned'=>$return,
       'title' => drupal_get_title(),
     );
     
diff --git a/templates/materio-didactique-home-block.tpl.php b/templates/materio-didactique-home-block.tpl.php
index b2dcceba..639e7176 100755
--- a/templates/materio-didactique-home-block.tpl.php
+++ b/templates/materio-didactique-home-block.tpl.php
@@ -1,3 +1,3 @@
 <?php
-
-print render(entity_view('node', $items, 'teaser'));
+$entity_view = entity_view('node', $items, 'teaser');
+print render($entity_view);
diff --git a/templates/materio-flag-mybookmarks-block.tpl.php b/templates/materio-flag-mybookmarks-block.tpl.php
index 66fdba3e..80629c90 100755
--- a/templates/materio-flag-mybookmarks-block.tpl.php
+++ b/templates/materio-flag-mybookmarks-block.tpl.php
@@ -1,4 +1,5 @@
 
 <section class="bookmarks">
-	<?php print render(entity_view('node', $bookmarks, $viewmode)); ?>
+  <?php $entity_view = entity_view('node', $bookmarks, $viewmode); ?>
+  <?php print render($entity_view); ?>
 </section>
\ No newline at end of file
diff --git a/templates/materio-search-api-actuality.tpl.php b/templates/materio-search-api-actuality.tpl.php
index 860277f4..30eea008 100755
--- a/templates/materio-search-api-actuality.tpl.php
+++ b/templates/materio-search-api-actuality.tpl.php
@@ -5,7 +5,8 @@
 	<?php if($count): ?>
 		<p class="actualities-infos"><?php print $actualities_infos; ?></p>
 		<div class="actuality-items">
-			<?php print render(entity_view('node', $items, $view_mode)); ?>
+			<?php $entity_view = entity_view('node', $items, $view_mode); ?>
+			<?php print render($entity_view); ?>
 		</div>
 		<div class="pager">
 			<?php print $pager; ?>