bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

json.return IE bug fixe suite + misc

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2013-12-05 15:35:14 +01:00
parent acb87f238a
commit 3d36e980af
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
materio_flag.pages.inc
View File

@ -118,7 +118,7 @@ function materio_flag_createlist_form($type){
$return = drupal_render($form); $return = drupal_render($form);
$rep = array( $rep = array(
'return'=>$return, 'rendered_form'=>$return,
); );
if ($debug) { if ($debug) {
@ -217,7 +217,7 @@ function materio_flag_editlist_form($type, $fid){
$return = drupal_render($form); $return = drupal_render($form);
$rep = array( $rep = array(
'return'=>$return, 'rendered_form'=>$return,
); );
}else{ }else{
$rep = array( $rep = array(
@ -478,11 +478,11 @@ function materio_flag_ajax_list($fid, $page = 0){
} elseif (isset($return)) { } elseif (isset($return)) {
if (is_array($return)) { if (is_array($return)) {
$return = drupal_render($return); $rendered = drupal_render($return);
} }
$rep = array( $rep = array(
'return' => $return, 'rendered' => $rendered,
'path' => $path, 'path' => $path,
'title' => drupal_get_title(), 'title' => drupal_get_title(),
); );

3
materio_search_api.module
View File

@ -756,4 +756,5 @@ function materio_search_api_block_view_alter(&$data, $block) {
} }
} }
} }
} }

5
materio_search_api_ajax.pages.inc
View File

@ -105,7 +105,7 @@ function materio_search_api_ajax_search($page = 0){
'keys'=>$keys, 'keys'=>$keys,
'keys_encoded'=>$keys_encoded, 'keys_encoded'=>$keys_encoded,
'search_path'=>$search_path, 'search_path'=>$search_path,
'return'=>$return, 'returned'=>$return,
'active_types'=>$active_types, 'active_types'=>$active_types,
'title' => drupal_get_title(), '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( $rep = array(
'path' => $path, 'path' => $path,
'return'=>$return, 'returned'=>$return,
'title' => drupal_get_title(), 'title' => drupal_get_title(),
); );

4
templates/materio-didactique-home-block.tpl.php
View File

@ -1,3 +1,3 @@
<?php <?php
$entity_view = entity_view('node', $items, 'teaser');
print render(entity_view('node', $items, 'teaser')); print render($entity_view);

3
templates/materio-flag-mybookmarks-block.tpl.php
View File

@ -1,4 +1,5 @@
<section class="bookmarks"> <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> </section>

3
templates/materio-search-api-actuality.tpl.php
View File

@ -5,7 +5,8 @@
<?php if($count): ?> <?php if($count): ?>
<p class="actualities-infos"><?php print $actualities_infos; ?></p> <p class="actualities-infos"><?php print $actualities_infos; ?></p>
<div class="actuality-items"> <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>
<div class="pager"> <div class="pager">
<?php print $pager; ?> <?php print $pager; ?>