Index: modules/cck/nodereference.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/cck/nodereference.module,v
retrieving revision 1.36
diff -u -r1.36 nodereference.module
--- modules/cck/nodereference.module	7 Nov 2006 10:47:55 -0000	1.36
+++ modules/cck/nodereference.module	7 Nov 2006 13:51:39 -0000
@@ -51,14 +51,15 @@
         '#title' => t('Content types that can be referenced'),
         '#multiple' => TRUE,
         '#default_value' => isset($field['referenceable_types']) ? $field['referenceable_types'] : array(),
-        '#options' => node_get_types(),
+        '#options' => node_get_types('names'),
       );
-      if (module_exist('views')) {
+      if (module_exists('views')) {
         $views = array('--' => '--');
         $result = db_query("SELECT name FROM {view_view} ORDER BY name");
         while ($view = db_fetch_array($result)) {
           $views[t('Existing Views')][$view['name']] = $view['name'];
         }
+        views_load_cache();
         $default_views = _views_get_default_views();
         foreach ($default_views as $view) {
           $views[t('Default Views')][$view->name] = $view->name;
@@ -81,7 +82,7 @@
 
     case 'save':
       $settings = array('referenceable_types');
-      if (module_exist('views')) {
+      if (module_exists('views')) {
         $settings[] = 'advanced_view';
       }
       return $settings;
@@ -301,7 +302,7 @@
  * Fetch an array of all candidate referenced nodes, for use in presenting the selection form to the user.
  */
 function _nodereference_potential_references($field, $return_full_nodes = FALSE, $string = '', $exact_string = false) {
-  if (module_exist('views') && ($view = views_get_view($field['advanced_view']))) {
+  if (module_exists('views') && ($view = views_get_view($field['advanced_view']))) {
     // advanced field : referenceable nodes defined by a view
     // let views.module build the query
 
@@ -314,6 +315,7 @@
     if (!$has_title) {
       views_view_add_field($view, 'node', 'title', '');
     }
+    views_load_cache();
     views_sanitize_view($view);
 
     // make sure the fields get included in the query
@@ -390,7 +392,7 @@
 }
 
 function _nodereference_item($field, $item, $html = false) {
-  if (module_exist('views') && ($view = views_get_view($field['advanced_view']))) {
+  if (module_exists('views') && ($view = views_get_view($field['advanced_view']))) {
     $output = theme('nodereference_item_advanced', $item, $view);
     if (!$html) {
       $output = strip_tags($output);