merge sandbox with prod

This commit is contained in:
Bachir Soussi Chiadmi
2014-07-07 16:35:39 +02:00
19 changed files with 827 additions and 289 deletions

View File

@@ -229,11 +229,17 @@ function materio_search_api_ajax_actuality($page = 0){
function materio_search_api_ajax_node($nid){
global $user;
$viewmode = isset($user->data['materiosearchapi_viewmode']) ? $user->data['materiosearchapi_viewmode'] : variable_get('defaultviewmode', 'full');
$viewmode = isset($_GET['viewmode']) ? $_GET['viewmode'] : (isset($user->data['materiosearchapi_viewmode']) ? $user->data['materiosearchapi_viewmode'] : variable_get('defaultviewmode', 'full'));
$rep = array(
"get" => $_GET,
"viewmode" => $viewmode
);
if($nodeview = node_view(node_load($nid),$viewmode)){
$rep = array(
'nid'=>$nid,
$rep = $rep+array(
'nid' => $nid,
'node' => drupal_render($nodeview),
);
drupal_json_output($rep);