makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10631] Use display name if available

Browse source 
PHPBB3-10631
This commit is contained in:
Nathan Guse 2012-07-23 14:01:13 -05:00 • committed by Unknown Bliss
parent 28ca2d6a5f
commit 74492b3cdd
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/acp/acp_extensions.php
View file

@ -158,7 +158,7 @@ class acp_extensions
$md_manager = $phpbb_extension_manager->get_extension_metadata($name, $template); $md_manager = $phpbb_extension_manager->get_extension_metadata($name, $template);
$template->assign_block_vars('enabled', array( $template->assign_block_vars('enabled', array(
'EXT_NAME' => $md_manager->get_metadata('name'), 'EXT_NAME' => $md_manager->get_metadata('display-name'),
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . $name, 'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . $name,
'U_PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . $name, 'U_PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . $name,
@ -181,7 +181,7 @@ class acp_extensions
$md_manager = $phpbb_extension_manager->get_extension_metadata($name, $template); $md_manager = $phpbb_extension_manager->get_extension_metadata($name, $template);
$template->assign_block_vars('disabled', array( $template->assign_block_vars('disabled', array(
'EXT_NAME' => $md_manager->get_metadata('name'), 'EXT_NAME' => $md_manager->get_metadata('display-name'),
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . $name, 'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . $name,
'U_PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . $name, 'U_PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . $name,
@ -207,7 +207,7 @@ class acp_extensions
$md_manager = $phpbb_extension_manager->get_extension_metadata($name, $template); $md_manager = $phpbb_extension_manager->get_extension_metadata($name, $template);
$template->assign_block_vars('disabled', array( $template->assign_block_vars('disabled', array(
'EXT_NAME' => $md_manager->get_metadata('name'), 'EXT_NAME' => $md_manager->get_metadata('display-name'),
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . $name, 'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . $name,
//'U_DELETE' => $this->u_action . '&action=delete_pre&ext_name=' . $name, //'U_DELETE' => $this->u_action . '&action=delete_pre&ext_name=' . $name,

19
phpBB/includes/extension/metadata_manager.php
View file

@ -55,7 +55,7 @@ class phpbb_extension_metadata_manager
* Processes and gets the metadata requested * Processes and gets the metadata requested
* *
* @param string $element All for all metadata that it has and is valid, otherwise specify which section you want by its shorthand term. * @param string $element All for all metadata that it has and is valid, otherwise specify which section you want by its shorthand term.
* @param boolean $template_output True if you want the requested metadata assigned to template vars * @param boolean $template_output True if you want the requested metadata assigned to template vars (only works on the 'all" case
* @return array Contains all of the requested metadata * @return array Contains all of the requested metadata
*/ */
public function get_metadata($element = 'all', $template_output = false) public function get_metadata($element = 'all', $template_output = false)
@ -89,20 +89,17 @@ class phpbb_extension_metadata_manager
break; break;
case 'name': case 'name':
if ($this->validate_name()) return ($this->validate_name()) ? $this->metadata['name'] : false;
break;
case 'display-name':
if ($this->validate_extra_display_name())
{ {
if ($template_output) return $this->metadata['extra']['display-name'];
{
$template->assign_vars(array(
'MD_NAME' => htmlspecialchars($this->metadata['name']),
));
}
return $this->metadata['name'];
} }
else else
{ {
return false; return ($this->validate_name()) ? $this->metadata['name'] : false;
} }
break; break;
// TODO: Add remaining cases as needed // TODO: Add remaining cases as needed