Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions core/acp/config_module.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@

class config_module
{
/** @var \phpbb\language\language */
public $language;
public $new_config;
public $tpl_name;
public $page_title;
public $u_action;

/**
* This function is called, when the main() function is called.
* You can use this function to add your language files, check for a valid mode, unset config options and more.
Expand Down
4 changes: 4 additions & 0 deletions core/acp/gallery_logs_module.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
class gallery_logs_module
{
var $u_action;
/** @var \phpbb\language\language */
var $language;
var $tpl_name;
var $page_title;

function main($id, $mode)
{
Expand Down
4 changes: 4 additions & 0 deletions core/acp/main_module.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
class main_module
{
var $u_action;
/** @var \phpbb\language\language */
var $language;
var $tpl_name;
var $page_title;

function main($id, $mode)
{
Expand Down
9 changes: 5 additions & 4 deletions core/album/display.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ public function get_parents($album_data)

if ($album_data['parent_id'] > 0)
{
if ($album_data['album_parents'] == '')
$cached_parents = json_decode($album_data['album_parents'], true);
if (!is_array($cached_parents))
{
$sql = 'SELECT album_id, album_name, album_type
FROM ' . $this->table_albums . '
Expand All @@ -222,7 +223,7 @@ public function get_parents($album_data)
}
$this->db->sql_freeresult($result);

$album_data['album_parents'] = serialize($album_parents);
$album_data['album_parents'] = json_encode($album_parents, JSON_UNESCAPED_UNICODE);

$sql = 'UPDATE ' . $this->table_albums . "
SET album_parents = '" . $this->db->sql_escape($album_data['album_parents']) . "'
Expand All @@ -231,7 +232,7 @@ public function get_parents($album_data)
}
else
{
$album_parents = @unserialize($album_data['album_parents']);
$album_parents = $cached_parents;
}
}

Expand Down Expand Up @@ -390,7 +391,7 @@ public function display_albums($root_data = '', $display_moderators = true, $ret
),
),

'WHERE' => 'a.parent_id = 0 AND ' . $sql_where,
'WHERE' => implode(' AND ', array('a.parent_id = 0', $sql_where)),
);
$sql = $this->db->sql_build_query('SELECT', $sql_array);
$result = $this->db->sql_query($sql);
Expand Down
Loading
Loading