Version 5.0.0 beta 6

system/Content/Taggable.php

@@ -105,7 +105,9 @@ trait Taggable
 	 */
 	public static function definedTags(): array
 	{
-		return array_values( Tag::getStore() );
+		$tags = array_values( Tag::getStore() );
+		natcasesort( $tags );
+		return $tags;
 	}
 	
 	/**
@@ -147,7 +149,7 @@ trait Taggable
 					$tagList[ $key ] = strtolower( $value );
 				} );
 
-				foreach ( Db::i()->select( '*', 'core_tags', array( 'tag_meta_app=? AND tag_meta_area=? AND tag_meta_id=?', static::$application, static::$module, $this->$idColumn ) ) as $tag )
+				foreach ( Db::i()->select( '*', 'core_tags', array( 'tag_meta_app=? AND tag_meta_area=? AND tag_meta_id=?', static::$application, static::$module, $this->$idColumn ), 'tag_text' ) as $tag )
 				{
 					if ( $tag['tag_prefix'] )
 					{
@@ -322,7 +324,8 @@ trait Taggable
 				'resultItemTemplate' => 'core.autocomplete.tagsResultItem',
 				'freeChoice' => false,
 				'minimized' => $minimized,
-				'addTokenText' => Member::loggedIn()->language()->get( 'tags_optional' )
+				'addTokenText' => Member::loggedIn()->language()->get( 'tags_optional' ),
+				'alphabetical' => true
 			) );
 
 		if ( Settings::i()->tags_force_lower )