More code cleanup

iMattPro · iMattPro · commit 37521ba1267b · 2024-05-16T14:44:12.000-07:00
Signed-off-by: Matt Friedman &lt;maf675@gmail.com&gt;
diff --git a/notification/method/webpush.php b/notification/method/webpush.php
@@ -451,12 +451,11 @@ protected function prepare_avatar($avatar)
 	{
 		$pattern = '/src=["\']?([^"\'>]+)["\']?/';
 
-		if (preg_match_all($pattern, $avatar, $matches, PREG_SET_ORDER))
-		{
-			$avatar = $matches[1][1] ?? $matches[0][1];
-		}
+		preg_match_all($pattern, $avatar, $matches);
+
+		$path = !empty($matches[1]) ? end($matches[1]) : $avatar;
 
-		return preg_replace('#^' . preg_quote($this->path_helper->get_web_root_path(), '#') . '#', $this->get_board_url(), $avatar, 1);
+		return preg_replace('#^' . preg_quote($this->path_helper->get_web_root_path(), '#') . '#', $this->get_board_url(), $path, 1);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -451,12 +451,11 @@ protected function prepare_avatar($avatar)`
`451`	`451`	`{`
`452`	`452`	`$pattern = '/src=["\']?([^"\'>]+)["\']?/';`
`453`	`453`
`454`		`- if (preg_match_all($pattern, $avatar, $matches, PREG_SET_ORDER))`
`455`		`- {`
`456`		`- $avatar = $matches[1][1] ?? $matches[0][1];`
`457`		`- }`
	`454`	`+ preg_match_all($pattern, $avatar, $matches);`
	`455`	`+`
	`456`	`+ $path = !empty($matches[1]) ? end($matches[1]) : $avatar;`
`458`	`457`
`459`		`- return preg_replace('#^' . preg_quote($this->path_helper->get_web_root_path(), '#') . '#', $this->get_board_url(), $avatar, 1);`
	`458`	`+ return preg_replace('#^' . preg_quote($this->path_helper->get_web_root_path(), '#') . '#', $this->get_board_url(), $path, 1);`
`460`	`459`	`}`
`461`	`460`
`462`	`461`	`/**`