Fix test notices

Author: iMattPro

controller/admin_controller.php

@@ -380,20 +380,20 @@ protected function ad_enable($enable)
 			'ad_enabled' => (int) $enable,
 		));
 
-		// If AJAX was used, show user a result message
-		if ($this->request->is_ajax())
-		{
-			$json_response = new \phpbb\json_response;
-			$json_response->send(array(
-				'text'  => $this->language->lang($enable ? 'ENABLED' : 'DISABLED'),
-				'title' => $this->language->lang('AD_ENABLE_TITLE', (int) $enable),
-			));
-		}
-
-		// Otherwise, show traditional infobox
 		if ($success)
 		{
-			$this->success($enable ? 'ACP_AD_ENABLE_SUCCESS' : 'ACP_AD_DISABLE_SUCCESS');
+			if ($this->request->is_ajax())
+			{
+				$json_response = new \phpbb\json_response;
+				$json_response->send(array(
+					'text'  => $this->language->lang($enable ? 'ENABLED' : 'DISABLED'),
+					'title' => $this->language->lang('AD_ENABLE_TITLE', (int) $enable),
+				));
+			}
+			else
+			{
+				$this->success($enable ? 'ACP_AD_ENABLE_SUCCESS' : 'ACP_AD_DISABLE_SUCCESS');
+			}
 		}
 		else
 		{

tests/controller/admin_controller_test.php

@@ -926,7 +926,7 @@ public function test_ad_enable($ad_id, $enable, $is_ajax, $err_msg)
 			->method('update_ad')
 			->willReturn((bool) $ad_id);
 
-		$this->request->expects(self::once())
+		$this->request->expects($ad_id ? self::once() : self::never())
 			->method('is_ajax')
 			->willReturn($is_ajax);