From b0337b21d54174a21303b362d8d8928862316d63 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 17 Jan 2016 14:11:21 +0100
Subject: [PATCH] [ticket/10824] Show display-name in acp and change composer
 name

PHPBB3-10824
---
 phpBB/includes/acp/acp_styles.php    | 2 +-
 phpBB/styles/prosilver/composer.json | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index c80b298889..6f83b4ce51 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -802,7 +802,7 @@ class acp_styles
 			$parent = $style_data['extra']['parent-style'];
 			$style = array(
 				'style_id'			=> 0,
-				'style_name'		=> $style_data['name'],
+				'style_name'		=> $style_data['extra']['display-name'],
 				'style_copyright'	=> $style_data['license'],
 				'style_active'		=> 0,
 				'style_path'		=> $dir,
diff --git a/phpBB/styles/prosilver/composer.json b/phpBB/styles/prosilver/composer.json
index 77a52095d7..4cd505f0d7 100644
--- a/phpBB/styles/prosilver/composer.json
+++ b/phpBB/styles/prosilver/composer.json
@@ -1,5 +1,5 @@
 {
-	"name": "prosilver",
+	"name": "phpbb/phpbb-style-prosilver",
 	"description": "phpBB Forum Software default style",
 	"type": "phpbb-style",
 	"version": "3.2.0-a1-dev",
@@ -23,7 +23,6 @@
 	},
 	"extra": {
 		"display-name": "prosilver",
-		"parent-style": "prosilver",
-		"phpbb-version": "3.2.0-a1-dev"
+		"phpbb-version": "3.2.0-a3-dev"
 	}
 }