Skip to content

Commit 5bfd106

Browse files
author
Leinad4Mind
committed
Fix error epv
1 parent 4b54388 commit 5bfd106

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

core/controller/album.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,12 @@ protected function display_images($album_id, $album_data, $start, $limit)
405405

406406
$s_username_hidden = $image_data['image_contest'] && !$this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) && ($this->user->data['user_id'] != $image_data['image_user_id'] || $image_data['image_user_id'] == ANONYMOUS);
407407
$this->template->assign_block_vars('imageblock.image', array(
408-
'IMAGE_ID' => $image_data['image_id'],
408+
'IMAGE_ID' => (int) $image_data['image_id'],
409409
'U_IMAGE' => $action_image,
410410
'UC_IMAGE_NAME' => $show_imagename ? htmlspecialchars_decode($image_data['image_name'], ENT_COMPAT) : false,
411411
'U_ALBUM' => $show_album ? $this->helper->route('phpbbgallery_core_album', array('album_id' => (int) $album_data['album_id'])) : false,
412412
'ALBUM_NAME' => $show_album ? $album_data['album_name'] : false,
413-
'IMAGE_VIEWS' => $show_views ? $image_data['image_view_count'] : -1,
413+
'IMAGE_VIEWS' => $show_views ? (int) $image_data['image_view_count'] : -1,
414414
//'UC_THUMBNAIL' => 'self::generate_link('thumbnail', $phpbb_ext_gallery->config->get('link_thumbnail'), $image_data['image_id'], $image_data['image_name'], $image_data['image_album_id']),
415415
'UC_THUMBNAIL' => $this->helper->route('phpbbgallery_core_image_file_mini', array('image_id' => $image_data['image_id'])),
416416
'UC_THUMBNAIL_ACTION' => $action,

tests/controller/gallery_album_test.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ public function test_for_base_clean()
149149
'S_STATUS_APPROVED' => true,
150150
'S_STATUS_UNAPPROVED' => false,
151151
'S_STATUS_UNAPPROVED_ACTION' => '',
152+
'S_STATUS_UNAPPROVED_PERMISSIONS' => false,
152153
'S_STATUS_LOCKED' => false,
153154
'U_REPORT' => '',
154155
'U_STATUS' => '',
@@ -183,6 +184,7 @@ public function test_for_base_clean()
183184
'S_STATUS_APPROVED' => true,
184185
'S_STATUS_UNAPPROVED' => false,
185186
'S_STATUS_UNAPPROVED_ACTION' => '',
187+
'S_STATUS_UNAPPROVED_PERMISSIONS' => false,
186188
'S_STATUS_LOCKED' => false,
187189
'U_REPORT' => '',
188190
'U_STATUS' => '',
@@ -368,6 +370,7 @@ public function test_for_base_load_modreators_allow_rates_and_comments()
368370
'S_STATUS_APPROVED' => true,
369371
'S_STATUS_UNAPPROVED' => false,
370372
'S_STATUS_UNAPPROVED_ACTION' => '',
373+
'S_STATUS_UNAPPROVED_PERMISSIONS' => false,
371374
'S_STATUS_LOCKED' => false,
372375
'U_REPORT' => '',
373376
'U_STATUS' => '',
@@ -402,6 +405,7 @@ public function test_for_base_load_modreators_allow_rates_and_comments()
402405
'S_STATUS_APPROVED' => true,
403406
'S_STATUS_UNAPPROVED' => false,
404407
'S_STATUS_UNAPPROVED_ACTION' => '',
408+
'S_STATUS_UNAPPROVED_PERMISSIONS' => false,
405409
'S_STATUS_LOCKED' => false,
406410
'U_REPORT' => '',
407411
'U_STATUS' => '',
@@ -436,6 +440,7 @@ public function test_for_base_load_modreators_allow_rates_and_comments()
436440
'S_STATUS_APPROVED' => true,
437441
'S_STATUS_UNAPPROVED' => false,
438442
'S_STATUS_UNAPPROVED_ACTION' => '',
443+
'S_STATUS_UNAPPROVED_PERMISSIONS' => false,
439444
'S_STATUS_LOCKED' => false,
440445
'U_REPORT' => '',
441446
'U_STATUS' => '',

0 commit comments

Comments
 (0)