Check user page for optimized early return

iMattPro · iMattPro · commit 06a033a9484e · 2025-09-10T18:40:54.000-07:00
diff --git a/event/main_listener.php b/event/main_listener.php
@@ -284,7 +284,9 @@ protected function is_non_content_page()
 	 */
 	public function append_agreement()
 	{
-		if (!$this->template->retrieve_var('S_AGREEMENT') || ($this->template->retrieve_var('AGREEMENT_TITLE') !== $this->language->lang('PRIVACY')))
+		if ((strpos($this->user->page['page_name'], 'ucp') !== 0)
+			|| !$this->template->retrieve_var('S_AGREEMENT')
+			|| ($this->template->retrieve_var('AGREEMENT_TITLE') !== $this->language->lang('PRIVACY')))
 		{
 			return;
 		}
diff --git a/tests/event/amend_agreement_test.php b/tests/event/amend_agreement_test.php
@@ -37,6 +37,7 @@ public function append_agreement_data()
 	public function test_append_agreement($s_agreement, $agreement_title, $expected_append_calls)
 	{
 		$this->config['sitename'] = 'Test Forum';
+		$this->user->page['page_name'] = 'ucp.php';
 
 		$this->template->expects(self::atMost(2))
 			->method('retrieve_var')

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,9 @@ protected function is_non_content_page()`
`284`	`284`	`*/`
`285`	`285`	`public function append_agreement()`
`286`	`286`	`{`
`287`		`- if (!$this->template->retrieve_var('S_AGREEMENT') \|\| ($this->template->retrieve_var('AGREEMENT_TITLE') !== $this->language->lang('PRIVACY')))`
	`287`	`+ if ((strpos($this->user->page['page_name'], 'ucp') !== 0)`
	`288`	`+ \|\| !$this->template->retrieve_var('S_AGREEMENT')`
	`289`	`+ \|\| ($this->template->retrieve_var('AGREEMENT_TITLE') !== $this->language->lang('PRIVACY')))`
`288`	`290`	`{`
`289`	`291`	`return;`
`290`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public function append_agreement_data()`
`37`	`37`	`public function test_append_agreement($s_agreement, $agreement_title, $expected_append_calls)`
`38`	`38`	`{`
`39`	`39`	`$this->config['sitename'] = 'Test Forum';`
	`40`	`+ $this->user->page['page_name'] = 'ucp.php';`
`40`	`41`
`41`	`42`	`$this->template->expects(self::atMost(2))`
`42`	`43`	`->method('retrieve_var')`