|
@@ -32,7 +32,7 @@ discard block |
|
|
block discarded – undo |
|
32
|
32
|
|
|
33
|
33
|
function import() |
|
34
|
34
|
{ |
|
35
|
|
- global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix ,$gallery_config, $gallery_album, $request; |
|
|
35
|
+ global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix, $gallery_config, $gallery_album, $request; |
|
36
|
36
|
|
|
37
|
37
|
$import_schema = $request->variable('import_schema', ''); |
|
38
|
38
|
$images = $request->variable('images', array(''), true); |
|
@@ -302,7 +302,7 @@ discard block |
|
|
block discarded – undo |
|
302
|
302
|
$album_id = $request->variable('album_id', 0); |
|
303
|
303
|
if (isset($_POST['users_pega'])) |
|
304
|
304
|
{ |
|
305
|
|
- $image_user = $phpbb_container->get('phpbbgallery.core.user'); |
|
|
305
|
+ $image_user = $phpbb_container->get('phpbbgallery.core.user'); |
|
306
|
306
|
$image_user->set_user_id($user_row['user_id']); |
|
307
|
307
|
if ($user->data['user_id'] != $user_row['user_id']) |
|
308
|
308
|
{ |
Please login to merge, or discard this patch.
satanasov /
phpbbgallery
