Version 5.0.0 beta 5

applications/core/modules/admin/languages/languages.php

@@ -781,9 +781,15 @@ class languages extends Controller
 			$lang->save();
 
 			$count = 0;
+			$where = [
+				[ 'lang_id=?', $lang->id ],
+				[ '(word_export=? or word_is_custom=?)', 1, 1 ],
+				[ 'word_custom is not null' ]
+			];
+
 			try
 			{
-				$count = Db::i()->select( 'COUNT(word_id)', 'core_sys_lang_words', array( 'lang_id=? AND word_export=1 AND word_custom IS NOT NULL', $lang->id ), 'word_id', NULL, 'word_id' )->first();
+				$count = Db::i()->select( 'COUNT(word_id)', 'core_sys_lang_words', $where, 'word_id', NULL, 'word_id' )->first();
 			}
 			catch ( UnderflowException $e ) {}
 
@@ -842,7 +848,9 @@ class languages extends Controller
 				$xml->endAttribute();
 
 				/* Add words */
-				foreach ( Db::i()->select( '*', 'core_sys_lang_words', array( 'lang_id=? AND word_app=? AND word_export=1 AND word_custom IS NOT NULL', $lang->id, $app->directory ), 'word_id' ) as $row )
+				$appWhere = $where;
+				$appWhere[] = [ 'word_app=?', $app->directory ];
+				foreach ( Db::i()->select( '*', 'core_sys_lang_words', $appWhere, 'word_id' ) as $row )
 				{
 					/* Start */
 					$xml->startElement( 'word' );