Index: modules/project/project.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project/project.module,v
retrieving revision 1.280
diff -u -p -r1.280 project.module
--- modules/project/project.module	14 Jul 2007 17:08:25 -0000	1.280
+++ modules/project/project.module	25 Jul 2007 16:45:32 -0000
@@ -312,9 +312,18 @@ function project_check_admin_access($pro
     return FALSE;
   }
   
+  $project_obj = is_numeric($project) ? node_load($project) : $project;
+  if (!isset($project_obj) || $project_obj->type != 'project_project') {
+    return FALSE;
+  }
+
+  if (user_access('administer projects')) {
+     return TRUE;
+  }
+
   // If $cvs_access is not defined, check to make sure the user has cvs access
   // and that the user's cvs account is approved.
-  if (project_use_cvs($project) && !isset($cvs_access)) {
+  if (project_use_cvs($project_obj) && !isset($cvs_access)) {
     if (db_num_rows(db_query("SELECT * FROM {cvs_accounts} WHERE uid = %d AND status = %d", $user->uid, CVS_APPROVED))) {
       $cvs_access = TRUE;
     }
@@ -323,18 +332,11 @@ function project_check_admin_access($pro
     }  
   }
 
-  $project_obj = is_numeric($project) ? node_load($project) : $project;
-  if (!isset($project_obj) || $project_obj->type != 'project_project') {
-    return FALSE;
-  }
-  if (user_access('administer projects')) {
-     return TRUE;
-  }
   if (user_access('maintain projects')) {
     if ($user->uid == $project_obj->uid) {
        return TRUE;
     }
-    if (project_use_cvs($project) && $cvs_access) {
+    if (project_use_cvs($project_obj) && $cvs_access) {
       if (db_num_rows(db_query("SELECT * FROM {cvs_project_maintainers} WHERE uid = %d AND nid = %d", $user->uid, $project_obj->nid))) {
         return TRUE;
       }
@@ -1005,6 +1007,7 @@ function project_use_taxonomy() {
  */
 function project_use_cvs($project) {
   if (module_exists('cvs')) {
+    $project = is_numeric($project) ? node_load($project) : $project;
     return isset($project->cvs_repository) && ($project->cvs_repository != 0);
   }
 }