Index: trunk/kernel/units/languages/import_xml.php
===================================================================
diff -u -r2144 -r2308
--- trunk/kernel/units/languages/import_xml.php	(.../import_xml.php)	(revision 2144)
+++ trunk/kernel/units/languages/import_xml.php	(.../import_xml.php)	(revision 2308)
@@ -307,32 +307,38 @@
 				$ret .= '<UNITSYSTEM>'.$row['UnitSystem'].'</UNITSYSTEM>'."\n";
 				
 				// phrases
-				$ret .= "\t\t".'<PHRASES>'."\n";
 				$phrases_sql = 'SELECT * FROM '.$phrases_table.' WHERE LanguageId = %s AND PhraseType IN (%s) AND Module IN (%s) ORDER BY Phrase';
 				if( in_array('In-Portal',$module_ids) ) array_push($module_ids, ''); // for old language packs
 				$rows = $this->Conn->Query( sprintf($phrases_sql,$language_id, implode(',',$phrase_types), '\''.implode('\',\'',$module_ids).'\'' ) );
-				foreach($rows as $row)
+				if($rows)
 				{
-					$ret .= sprintf($phrase_tpl, $row['Phrase'], $row['Module'], $row['PhraseType'], base64_encode($row['Translation']) );
+					$ret .= "\t\t".'<PHRASES>'."\n";
+					foreach($rows as $row)
+					{
+						$ret .= sprintf($phrase_tpl, $row['Phrase'], $row['Module'], $row['PhraseType'], base64_encode($row['Translation']) );
+					}
+					$ret .= "\t\t".'</PHRASES>'."\n";
 				}
-				$ret .= "\t\t".'</PHRASES>'."\n";
 				
 				// email events
-				$ret .= "\t\t".'<EVENTS>'."\n";
 				if( in_array('In-Portal',$module_ids) ) unset( $module_ids[array_search('',$module_ids)] ); // for old language packs
 				$module_sql = preg_replace('/(.*) OR $/', '\\1', preg_replace('/(.*),/U', 'INSTR(Module,\'\\1\') OR ', implode(',', $module_ids).',' ) );
 				
 				$sql = 'SELECT EventId FROM '.$mainevents_table.' WHERE '.$module_sql;
 				$event_ids = $this->Conn->GetCol($sql);
 				
-				$event_sql = 'SELECT * FROM '.$emailevents_table.' WHERE LanguageId = %s AND EventId IN (%s)';
-				$rows = $this->Conn->Query( sprintf($event_sql,$language_id, $event_ids ? implode(',',$event_ids) : '' ) );
-				foreach($rows as $row)
+				if($event_ids)
 				{
-					list($event_name, $event_type) = explode('_', $this->events_hash[ $row['EventId'] ] );
-					$ret .= sprintf($event_tpl, $row['MessageType'], $event_name, $event_type, base64_encode($row['Template']) );
+					$ret .= "\t\t".'<EVENTS>'."\n";
+					$event_sql = 'SELECT * FROM '.$emailevents_table.' WHERE LanguageId = %s AND EventId IN (%s)';
+					$rows = $this->Conn->Query( sprintf($event_sql,$language_id, $event_ids ? implode(',',$event_ids) : '' ) );
+					foreach($rows as $row)
+					{
+						list($event_name, $event_type) = explode('_', $this->events_hash[ $row['EventId'] ] );
+						$ret .= sprintf($event_tpl, $row['MessageType'], $event_name, $event_type, base64_encode($row['Template']) );
+					}
+					$ret .= "\t\t".'</EVENTS>'."\n";
 				}
-				$ret .= "\t\t".'</EVENTS>'."\n";
 				$ret .= "\t".'</LANGUAGE>'."\n";
 			}