aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorGraham Eames <grahamje@users.sourceforge.net>2006-07-20 20:27:23 +0000
committerGraham Eames <grahamje@users.sourceforge.net>2006-07-20 20:27:23 +0000
commitd20997f5bcd72581d1a6a03709529ff11503ee23 (patch)
treee994872fbeafd9a62a10079dbbae37b9db7f5773 /phpBB/includes
parent191a21d461debcce05719a17f36bec8fbf1ef7d4 (diff)
downloadforums-d20997f5bcd72581d1a6a03709529ff11503ee23.tar
forums-d20997f5bcd72581d1a6a03709529ff11503ee23.tar.gz
forums-d20997f5bcd72581d1a6a03709529ff11503ee23.tar.bz2
forums-d20997f5bcd72581d1a6a03709529ff11503ee23.tar.xz
forums-d20997f5bcd72581d1a6a03709529ff11503ee23.zip
* Missing image in imageset editing
* Sort the list of images * Enforce default username limits on install git-svn-id: file:///svn/phpbb/trunk@6196 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_styles.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 2d123c5597..92bd515f98 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -1279,7 +1279,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
'forums' => array(
'forum', 'forum_new', 'forum_locked', 'forum_link', 'sub_forum', 'sub_forum_new',),
'folders' => array(
- 'folder', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_locked_announce', 'folder_locked_announce_new', 'folder_locked_announce_posted', 'folder_locked_announce_new_posted', 'folder_locked_global', 'folder_locked_global_new', 'folder_locked_global_posted', 'folder_locked_global_new_posted', 'folder_locked_sticky', 'folder_locked_sticky_new', 'folder_locked_sticky_posted', 'folder_locked_sticky_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted', 'folder_global', 'folder_global_posted', 'folder_global_new', 'folder_global_new_posted',),
+ 'folder', 'folder_moved', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_locked_announce', 'folder_locked_announce_new', 'folder_locked_announce_posted', 'folder_locked_announce_new_posted', 'folder_locked_global', 'folder_locked_global_new', 'folder_locked_global_posted', 'folder_locked_global_new_posted', 'folder_locked_sticky', 'folder_locked_sticky_new', 'folder_locked_sticky_posted', 'folder_locked_sticky_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted', 'folder_global', 'folder_global_posted', 'folder_global_new', 'folder_global_new_posted',),
'polls' => array(
'poll_left', 'poll_center', 'poll_right',),
);
@@ -1372,6 +1372,10 @@ pagination_sep = \'{PAGINATION_SEP}\'
}
closedir($dp);
+ // Make sure the list of possible images is sorted alphabetically
+ sort($imagesetlist['nolang']);
+ sort($imagesetlist['lang']);
+
$imagesetlist_options = '';
foreach ($imagesetlist as $type => $img_ary)
{