Index: modules/update_status/update_status.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/update_status/update_status.module,v
retrieving revision 1.31
diff -u -p -r1.31 update_status.module
--- modules/update_status/update_status.module	22 May 2007 00:07:45 -0000	1.31
+++ modules/update_status/update_status.module	22 May 2007 18:03:12 -0000
@@ -283,19 +283,25 @@ function update_status_get_projects() {
 
     $info['check'] = TRUE;
     if (!array_key_exists('project', $info)) {
-      // guess the project from the directory.
-      $last = '';
-      foreach (array_reverse(explode('/', $file->filename)) as $dir) {
-        if ($dir == 'modules') {
-          break;
-        }
-        $last = $dir;
-      }
-      if ($last) {
-        $info['project'] = $last;
+      // If we don't know the project yet, first see if this is core:
+      if (isset($info['package']) && (strpos($info['package'], 'Core -') !== FALSE)) {
+        $info['project'] = 'drupal';
       }
       else {
-        continue;
+        // This isn't a core module, so guess the project from the directory.
+        $last = '';
+        foreach (array_reverse(explode('/', $file->filename)) as $dir) {
+          if ($dir == 'modules') {
+            break;
+          }
+          $last = $dir;
+        }
+        if ($last) {
+          $info['project'] = $last;
+        }
+        else {
+          continue;
+        }
       }
     }
 
@@ -312,7 +318,9 @@ function update_status_get_projects() {
         $info['version'] = update_status_make_nice_version($info['version'], $type);
       }
 
-      if (strpos($info['version'], '-dev') !== FALSE) {
+      // We need to special case core since it doesn't use '-' before dev.
+      $dev_suffix = $info['project'] == 'drupal' ? 'dev' : '-dev';
+      if (strpos($info['version'], $dev_suffix) !== FALSE) {
         $type = 'dev';
       }