? 319876-views.patch
? 419012-search.patch
Index: settings_custom_url.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/settings_custom_url.inc,v
retrieving revision 1.18
diff -u -p -r1.18 settings_custom_url.inc
--- settings_custom_url.inc	6 Mar 2009 22:05:56 -0000	1.18
+++ settings_custom_url.inc	6 Apr 2009 14:00:03 -0000
@@ -74,7 +74,8 @@ function custom_url_rewrite_outbound(&$p
             $source = db_result(db_query("SELECT domain_id FROM {domain_source} WHERE nid = %d", $nid));
             $domain[$nid] = domain_lookup($source);
           }
-          else {
+          // If Domain Source was installed after the main module, some nodes may not be assigned a source domain.
+          if (!$use_source || $domain[$nid] == -1) {
             // Load the domain data for this node -- but only take the first match.
             $id = db_result(db_query_range("SELECT gid FROM {domain_access} WHERE nid = %d AND realm = '%s' ORDER BY gid", $nid, 'domain_id', 0, 1));
             $domain[$nid] = domain_lookup($id);