### Eclipse Workspace Patch 1.0 #P org.eclipse.babel.server Index: classes/export/generate1.php =================================================================== RCS file: /cvsroot/technology/org.eclipse.babel/server/classes/export/generate1.php,v retrieving revision 1.35 diff -u -r1.35 generate1.php --- classes/export/generate1.php 27 Oct 2008 12:45:40 -0000 1.35 +++ classes/export/generate1.php 6 Nov 2008 11:43:30 -0000 @@ -103,14 +103,14 @@ * Determine which plug-ins need to be in this language pack. */ if (strcmp($language_iso, "en_AA") == 0) { - $file_result = mysql_query("SELECT DISTINCT f.project_id, f.version, f.file_id, f.name + $file_result = mysql_query("SELECT DISTINCT f.project_id, f.version, f.file_id, f.name, f.plugin_id FROM files AS f INNER JOIN strings AS s ON f.file_id = s.file_id INNER JOIN release_train_projects as v ON (f.project_id = v.project_id AND f.version = v.version) WHERE f.is_active AND v.train_id = '" . $train_row['train_id'] . "'"); } else { - $file_result = mysql_query("SELECT DISTINCT f.project_id, f.version, f.file_id, f.name + $file_result = mysql_query("SELECT DISTINCT f.project_id, f.version, f.file_id, f.name, f.plugin_id FROM files AS f INNER JOIN strings AS s ON f.file_id = s.file_id INNER JOIN translations AS t ON (s.string_id = t.string_id AND t.is_active) @@ -140,7 +140,7 @@ if (preg_match("/^([a-zA-Z0-9\.]+)\/(.*)$/", $file_row['name'], $matches)) { $file_row['subname'] = $matches[2]; - $plugins[$matches[1]][] = $file_row; + $plugins[$file_row['plugin_id']][] = $file_row; } else { echo " WARNING: no plug-in name found in file " . $file_row['file_id'] . " \"" . $file_row['name'] . "\"\n"; }