mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

Fix bug #45705 - Show error in the ACP when template folder is not readable.

Browse Source 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9565 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-06-08 22:33:30 +00:00
parent 9f21f1ab5e
commit 2af8393d0f
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View File

@ -95,6 +95,7 @@
<li>[Fix] Correctly show private message history (Bug #46065 - Patch by bantu)
<li>[Fix] Various XHTML mistakes in prosilver and subsilver2. (Bugs #38555, #45505 - Patch by Raimon, #45785, #45865)</li>
<li>[Fix] Move post bump information markup to the template. (Bug #34295 - Patch by bantu)</li>
<li>[Fix] Show error in the ACP when template folder is not readable. (Bug #45705 - Patch by bantu)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Feature] Backported 3.2 captcha plugins.</li>

2
phpBB/includes/acp/acp_attachments.php
View File

@ -694,7 +694,7 @@ class acp_attachments
$imglist = filelist($phpbb_root_path . $img_path);
if (sizeof($imglist))
if (!empty($imglist['']))
{
$imglist = array_values($imglist);
$imglist = $imglist[0];

5
phpBB/includes/acp/acp_styles.php
View File

@ -827,6 +827,11 @@ parse_css_file = {PARSE_CSS_FILE}
unset($file_info);
}
if (empty($filelist['']))
{
trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
}
// Now create the categories
$filelist_cats[''] = array();
foreach ($filelist as $pathfile => $file_ary)

2
phpBB/includes/functions_admin.php
View File

@ -359,7 +359,7 @@ function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $incl
*/
function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
{
$matches = array();
$matches = array($dir => array());
// Remove initial / if present
$rootdir = (substr($rootdir, 0, 1) == '/') ? substr($rootdir, 1) : $rootdir;