1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00

Merge branch 'ticket/13930' into ticket/13930-master

Conflicts:
	phpBB/includes/acp/acp_database.php
This commit is contained in:
Marc Alexander
2015-06-08 15:39:47 +02:00
9 changed files with 76 additions and 13 deletions

View File

@@ -1013,7 +1013,7 @@ class acp_styles
// Assign template variables
$this->template->assign_block_vars('styles_list', $row);
foreach($actions as $action)
foreach ($actions as $action)
{
$this->template->assign_block_vars('styles_list.actions', $action);
}