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' );

applications/core/modules/admin/members/members.php

@@ -4782,7 +4782,7 @@ class members extends Controller
 		];
 
 		$table->joins[] = [
-			'select'	=> 'core_badges.id as badge_id, image',
+			'select'	=> 'core_badges.id as badge_id, image, badge_use_image',
 			'from'		=> 'core_badges',
 			'where'		=> 'core_badges.id=core_member_badges.badge',
 			'type'		=> 'INNER'
@@ -4803,7 +4803,7 @@ class members extends Controller
 			{
 				/* Wade likes simple table field names like 'id', I like unique ones like 'log_id' for this reason :D */
 				$badge = Badge::constructFromData( array_merge( $row, [ 'id' => $row['badge_id'] ] ) );
-				return $badge->html('ipsDimension:5 i-margin-end_icon') . ' ' . $badge->_title;
+				return $badge->html('ipsDimension i-margin-end_icon i-basis_40') . ' ' . $badge->_title;
 			},
 			'datetime' => function( $val ) {
 				return DateTime::ts( $val );

applications/core/modules/front/system/widgets.php

@@ -109,11 +109,18 @@ class widgets extends Controller
 
 			foreach( $application->getAvailableWidgets() as $block )
 			{
+				/* @var Widget $block */
 				if ( !$block->isExecutableByApp( array( $this->pageApp, Area::AREA_SIDEBAR ) ) )
 				{
 					continue;
 				}
 
+				/* Is this widget hidden from the block list? */
+				if( !$block::$showInBlockList )
+				{
+					continue;
+				}
+
 				if ( in_array( $block->key, $favoriteIds ) )
 				{
 					$favorites[$block->key] = $block;