Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-05-06 01:05:21 +02:00
parent 27f9ae0949 072957b6ec
commit 76dbec58d9
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
migrations/v210_beta1.php
View File

@@ -183,6 +183,7 @@ class v210_beta1 extends \phpbb\db\migration\migration
$sql = 'SELECT * FROM ' . $this->table_prefix . 'portal_config'; $sql = 'SELECT * FROM ' . $this->table_prefix . 'portal_config';
$result = $this->db->sql_query_limit($sql, 1); $result = $this->db->sql_query_limit($sql, 1);
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
if (!empty($row)) if (!empty($row))
{ {
return; return;
@@ -204,6 +205,7 @@ class v210_beta1 extends \phpbb\db\migration\migration
{ {
$groups_ary[$row['group_name']] = $row['group_id']; $groups_ary[$row['group_name']] = $row['group_id'];
} }
$this->db->sql_freeresult($result);
// set portal config // set portal config
$this->set_portal_config('board3_menu_array_1', serialize(array( $this->set_portal_config('board3_menu_array_1', serialize(array(

1
modules/attachments.php
View File

@@ -187,6 +187,7 @@ class attachments extends module_base
'title' => $row['extension'], 'title' => $row['extension'],
); );
} }
$this->db->sql_freeresult($result);
$selected = $this->get_selected_filetypes($module_id); $selected = $this->get_selected_filetypes($module_id);