From 4f4e2ddcca96a4fb17a0dbbdba152bdc11aee3bd Mon Sep 17 00:00:00 2001
From: Mark Carver <mark.carver@me.com>
Date: Fri, 25 May 2012 15:55:18 -0500
Subject: [PATCH] Patched viewreference module.

---
 viewreference.module |  138 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 84 insertions(+), 54 deletions(-)

diff --git a/viewreference.module b/viewreference.module
index 61a1309..d109fdb 100755
--- a/viewreference.module
+++ b/viewreference.module
@@ -34,6 +34,9 @@ function viewreference_theme() {
         'append_id' => FALSE,
       ),
     ),
+    'viewreference_formatter' => array(
+      'variables' => array('view' => NULL),
+    ),
     'viewreference_formatter_default' => array(
       'variables' => array('element' => NULL),
     ),
@@ -396,105 +399,132 @@ function viewreference_views_display_title($view_name, $view, $display) {
  * @return
  *   The array of useful data about the view.
  */
-function viewreference_get_view($element, $params = array()) {
+function viewreference_get_view($element, $op) {
+  $output = array(
+    'content' => array('#markup' => ''),
+  );
   if (!empty($element['item']['view_id'])) {
-    $view_id_parts = explode(':', $element['item']['view_id']);
-    $view['name'] = $view_id_parts[0];
-    $view['display'] = $view_id_parts[1];
-    $view['view'] = views_get_view($view['name']);
-    if ($view['view'] && $view['view']->access($view['display'])) {
+    list($name, $display) = explode(':', $element['item']['view_id']);
+    $view = views_get_view($name);
+    if ($view && $view->access($display)) {
+      // Get the view title
+      $title = theme('viewreference_display_title', array(
+        'view' => $view,
+        'view_name' => $name,
+        'display_key' => $display,
+      ));
+      
       // Save $_GET['q'] so it can be restored before returning from this function.
       $q = $_GET['q'];
-      if (in_array('embed', $params)) {
-        $view['args'] = viewreference_get_element_args($element);
-        if (!empty($view['args'])) {
-          $_GET['q'] .= '/' . implode('/', $view['args']);
-        }
-        $view['embed'] = $view['view']->preview($view['display'], $view['args']);
+
+      $args = viewreference_get_element_args($element);
+      if (!empty($args)) {
+        $_GET['q'] .= '/' . implode('/', $args);
       }
-      if (in_array('title', $params) || in_array('link', $params)) {
-        $view['title'] = theme('viewreference_display_title', $view);
-        if (in_array('link', $params)) {
-          $disabled = isset($view['view']->disabled) ? $view['view']->disabled:  FALSE;
-          if (isset($view['view']->display[$view['display']]->display_options['path']) && !$disabled) {
-            $view['args'] = isset($view['args']) ? $view['args'] : viewreference_get_element_args($element);
-            $view['url_args'] = implode('/', $view['args']);
-            $view['path'] = $view['view']->display[$view['display']]->display_options['path'];
-            if ($view['url_args']) {
-              $view['path'] .= '/' . $view['url_args'];
-            }
-            $view['link'] = l($view['title'], $view['view']->get_url($view['args'], $view['path']));
+      
+      // Render the view title
+      if ($op == 'full' || $op == 'title') {
+        $output['content']['#markup'] .= $title;
+      }
+
+      // Render the view content
+      if ($op == 'default' || $op == 'full') {
+        $output['content']['#markup'] .= $view->preview($display, $args);
+      }
+      
+      // Render a link or the path to the view.
+      if ($op == 'link' || $op == 'path') {
+        $disabled = isset($view->disabled) ? $view->disabled:  FALSE;
+        if (isset($view->display[$display]->display_options['path']) && !$disabled) {
+          $path = $view->display[$display]->display_options['path'];
+          $url_args = implode('/', $args);
+          if ($url_args) {
+            $path .= '/' . $url_args;
           }
-          else {
-            $view['link'] = $view['title'];
+          if ($op == 'link') {
+            $output['content']['#markup'] .= l($title, $view->get_url($args, $path));
+          }
+          elseif ($op == 'path') {
+            $output['content']['#markup'] .= $path;
           }
         }
+        else {
+          if ($op == 'link') {
+            $output['content']['#markup'] .= $title;
+          }
+        }        
+      }
+      
+      // Before returning the output, add contextual links for the view.
+      if (module_exists('contextual')) {
+        $output += contextual_element_info();
+        views_add_contextual_links($output['contextual_links'], 'block', $view, $display);
       }
-      $_GET['q'] = $q;
-      return $view;
     }
   }
+  return $output;
+}
+
+/**
+ * Theme function that all the viewreference field formatters use.
+ */
+function theme_viewreference_formatter($variables) {
+  $view = $variables['view'];
+  // Wrap this output if there are any contextual links.
+  if (isset($view['contextual_links'])) {
+    // Ensure contextual links are rendered before the content
+    $view['contextual_links']['#weight'] = -10;
+    if (isset($view['contextual_links']['#contextual_links']) && !empty($view['contextual_links']['#contextual_links'])) {
+      $view['#prefix'] = '<div class="contextual-links-region">';
+      $view['#suffix'] = '</div>';
+    }
+  }
+  return drupal_render($view);
 }
 
 /**
  * Theme function for 'default' viewreference field formatter.
  */
 function theme_viewreference_formatter_default($variables) {
-  $element = &$variables['element'];
-  $output = '';
-  if ($view = viewreference_get_view($element, array('embed'))) {
-    $output .= $view['embed'];
+  if ($view = viewreference_get_view($variables['element'], 'default')) {
+    return theme('viewreference_formatter', array('view' => $view));
   }
-  return $output;
 }
 
 /**
  * Theme function for 'full' viewreference field formatter.
  */
 function theme_viewreference_formatter_full($variables) {
-  $element = &$variables['element'];
-  $output = '';
-  if ($view = viewreference_get_view($element, array('title', 'embed'))) {
-    $output .= '<h3 class="title viewreference-title">' . $view['title'] . '</h3>';
-    $output .= $view['embed'];
+  if ($view = viewreference_get_view($variables['element'], 'full')) {
+    return theme('viewreference_formatter', array('view' => $view));
   }
-  return $output;
 }
 
 /**
  * Theme function for 'plain' viewreference field formatter.
  */
 function theme_viewreference_formatter_plain($variables) {
-  $element = &$variables['element'];
-  $output = '';
-  if ($view = viewreference_get_view($element, array('title'))) {
-    $output .= $view['title'];
+  if ($view = viewreference_get_view($variables['element'], 'title')) {
+    return theme('viewreference_formatter', array('view' => $view));
   }
-  return $output;
 }
 
 /**
  * Theme function for 'link' viewreference field formatter.
  */
 function theme_viewreference_formatter_link($variables) {
-  $element = &$variables['element'];
-  $output = '';
-  if ($view = viewreference_get_view($element, array('link'))) {
-    $output .= $view['link'];
+  if ($view = viewreference_get_view($variables['element'], 'link')) {
+    return theme('viewreference_formatter', array('view' => $view));
   }
-  return $output;
 }
 
 /**
  * Theme function for 'path' viewreference field formatter.
  */
 function theme_viewreference_formatter_path($variables) {
-  $element = &$variables['element'];
-  $output = '';
-  if ($view = viewreference_get_view($element, array('link'))) {
-    $output .= isset($view['path']) ? $view['path'] : $view['link'];
+  if ($view = viewreference_get_view($variables['element'], 'path')) {
+    return theme('viewreference_formatter', array('view' => $view));
   }
-  return $output;
 }
 
 /**
-- 
1.7.10.1

