Version 5.0.0 beta 3

applications/core/modules/admin/customization/themeeditor.php

@@ -155,15 +155,15 @@ class themeeditor extends Controller
 		$table->parsers = [
 			'setting_name' => function( $val, $row )
 			{
-				return Member::loggedIn()->language()->addToStack( Setting::$titleLangPrefix . $row['setting_id'] );
+				return Member::loggedIn()->language()->addToStack( Setting::$titleLangPrefix . $row['setting_key'] );
 			},
 			'setting_type' => function( $val )
 			{
 				return Member::loggedIn()->language()->addToStack( 'themeeditor_setting_type__' . $val );
 			},
-			'setting_category_id' => function( $val )
+			'setting_category_id' => function( $val, $row )
 			{
-				return Member::loggedIn()->language()->addToStack( Category::$titleLangPrefix . $val );
+				return Setting::constructFromData( $row )->parent()->_title;
 			}
 		];
 
@@ -205,7 +205,7 @@ class themeeditor extends Controller
 		$table->parsers = [
 			'cat_name' => function( $val, $row )
 			{
-				return "<i class='" . Category::constructFromData( $row )->icon() ."'></i> " . Member::loggedIn()->language()->addToStack( Category::$titleLangPrefix . $row['cat_id'] );
+				return "<i class='" . Category::constructFromData( $row )->icon() ."'></i> " . Member::loggedIn()->language()->addToStack( Category::$titleLangPrefix . $row['cat_key'] );
 			}
 		];
 

applications/core/modules/admin/customization/themes.php

@@ -552,7 +552,7 @@ class themes extends Controller
 									{
 										$category->save();
 									}
-									Lang::saveCustom( 'core', 'themeeditor_cat_' . $category->id, $xml->readString() );
+									Lang::saveCustom( 'core', 'themeeditor_cat_' . $category->key, $xml->readString() );
 									break;
 
 								case 'icon':
@@ -626,7 +626,7 @@ class themes extends Controller
 									{
 										$setting->save();
 									}
-									Lang::saveCustom( 'core', 'themeeditor_var_' . $setting->id, $xml->readString() );
+									Lang::saveCustom( 'core', 'themeeditor_var_' . $setting->key, $xml->readString() );
 									break;
 
 								case 'desc':
@@ -637,7 +637,7 @@ class themes extends Controller
 										{
 											$setting->save();
 										}
-										Lang::saveCustom( 'core', 'themeeditor_var_' . $setting->id . '_desc', $description );
+										Lang::saveCustom( 'core', 'themeeditor_var_' . $setting->key . '_desc', $description );
 									}
 									break;
 
@@ -1088,7 +1088,7 @@ class themes extends Controller
 					}
 
 					$xml->startElement( 'name' );
-					$xml->text( $lang->get( 'themeeditor_cat_' . $cat['cat_id'] ) );
+					$xml->text( $lang->get( 'themeeditor_cat_' . $cat['cat_key'] ) );
 					$xml->endElement();
 
 					$xml->startElement( 'icon' );
@@ -1132,13 +1132,13 @@ class themes extends Controller
 					}
 
 					$xml->startElement( 'name' );
-					$xml->text( $lang->get( 'themeeditor_var_' . $setting['setting_id'] ) );
+					$xml->text( $lang->get( 'themeeditor_var_' . $setting['setting_key'] ) );
 					$xml->endElement();
 
-					if( $lang->checkKeyExists( 'themeeditor_var_' . $setting['setting_id'] . '_desc' ) )
+					if( $lang->checkKeyExists( 'themeeditor_var_' . $setting['setting_key'] . '_desc' ) )
 					{
 						$xml->startElement( 'desc' );
-						$xml->writeCdata( $lang->get( 'themeeditor_var_' . $setting['setting_id'] . '_desc' ) );
+						$xml->writeCdata( $lang->get( 'themeeditor_var_' . $setting['setting_key'] . '_desc' ) );
 						$xml->endElement();
 					}
 

applications/core/modules/admin/developer/themeeditor.php

@@ -131,7 +131,7 @@ class themeeditor extends Controller
 				'link' => $this->url->setQueryString( array( 'do' => 'categoryForm', 'parent' => $category->id ) )
 			];
 		}
-		elseif( $category->hasSettings() or $category->hasColors() or !$category->hasContents() )
+		if( $category->hasSettings() or $category->hasColors() or !$category->hasContents() )
 		{
 			$buttons['add'] = array(
 				'icon'	=> 'plus-circle',

applications/core/modules/admin/discovery/tags.php

@@ -67,6 +67,34 @@ class tags extends Controller
 		parent::execute();
 	}
 
+	/**
+	 * @return int|null
+	 */
+	public function _getRootsPerPage(): ?int
+	{
+		return 100;
+	}
+
+	/**
+	 * Get Root Rows
+	 *
+	 * @return	array
+	 */
+	public function _getRoots(): array
+	{
+		$args = func_get_args(); // We actually send [ start, limit ] to this method
+		$nodeClass = $this->nodeClass;
+		$rows = array();
+		$start = $args[0][0] ?? 0;
+		$limit = $args[0][1] ?? $this->_getRootsPerPage();
+
+		foreach( $nodeClass::roots( NULL, NULL, [], [ $start, $limit ] ) as $node )
+		{
+			$rows[ $node->_id ] = $this->_getRow($node);
+		}
+
+		return $rows;
+	}
 	/**
 	 * Manage
 	 *

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

@@ -764,7 +764,6 @@ class languages extends Controller
 		// This appears inside a dialog. The following instructs the dialog to handle the download via JS rather than using a native form download. This allows the dialog to close when done.
 		$filename = $lang->title . " {$lang->version}.xml";
 		$form->attributes['data-form-is-download'] = '';
-		$form->attributes['data-form-download-name'] = "testing to see if this works " . $filename;
 
 		$form->add( new Text( 'language_export_author_name', $lang->author_name, false ) );
 		$form->add( new FormUrl( 'language_export_author_url', $lang->author_url, false ) );