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

Merge branch 'develop-olympus' into develop

Browse source 
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.

Conflicts:
	phpBB/includes/acp/acp_styles.php
This commit is contained in:
Nils Adermann 2012-05-31 15:46:23 +02:00
commit b16f3834a3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_styles.php
View file

@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
class acp_styles class acp_styles
{ {
public $u_action; public $u_action;
protected $u_base_action; protected $u_base_action;
protected $s_hidden_fields; protected $s_hidden_fields;
protected $mode; protected $mode;