Merge pull request #311 from Leinad4Mind/who-is-online-fix

Fix who is online and circular reference - thks to galex3

Author: satanasov

core/config/services.yml

@@ -249,6 +249,8 @@ services:
             - '%core.root_path%'
             - '%core.php_ext%'
             - '%tables.phpbbgallery.watch%'
+        calls:
+            - [set_image, ['@phpbbgallery.core.image']]
     phpbbgallery.core.log:
         class: phpbbgallery\core\log
         arguments:

core/controller/index.php

@@ -237,7 +237,7 @@ public function base()
 			'U_VIEW_FORUM'	=> $this->helper->route('phpbbgallery_core_index'),
 		));
 
-		return $this->helper->render('gallery/index_body.html', $this->language->lang('GALLERY'));
+		return $this->helper->render('gallery/index_body.html', $this->language->lang('GALLERY'), 200, $this->gallery_config->get('disp_whoisonline'));
 	}
 
 	/**

core/notification/helper.php

@@ -28,7 +28,7 @@ class helper
 	protected $image;
 	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user,
 	\phpbbgallery\core\auth\auth $gallery_auth, \phpbbgallery\core\album\loader $album_load, \phpbb\controller\helper $helper, \phpbbgallery\core\url $url,
-	Container $phpbb_container, $root_path, $php_ext, $watch_table, \phpbbgallery\core\image\image $image)
+	Container $phpbb_container, $root_path, $php_ext, $watch_table)
 	{
 		$this->config = $config;
 		$this->db = $db;
@@ -43,7 +43,6 @@ public function __construct(\phpbb\config\config $config, \phpbb\db\driver\drive
 		$this->root_path = $root_path;
 		$this->php_ext = $php_ext;
 		$this->watch_table = $watch_table;
-		$this->image = $image;
 	}
 
 	/**
@@ -299,4 +298,9 @@ public function new_image($data)
 		$data['targets'] = $targets;
 		$this->notify('new_image', $data);
 	}
+
+	public function set_image(\phpbbgallery\core\image\image $image)
+	{
+		$this->image = $image;
+	}
 }