Merge branch 'master' into dev/4.0

iMattPro · iMattPro · commit e7f57a52075b · 2026-04-16T16:57:03.000-07:00
diff --git a/tests/functional/viewonline_test.php b/tests/functional/viewonline_test.php
@@ -22,12 +22,12 @@ protected function visit_rules_as_admin()
 	{
 		$db = $this->get_db();
 
-		// XXX hardcoded user id
+		// Visit Ideas as user "admin"
 		$sql = 'DELETE FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = 2';
 		$db->sql_query($sql);
 
 		$this->login();
-		$crawler = self::request('GET', "index.php/rules?sid=$this->sid");
+		$crawler = self::request('GET', "app.php/rules?sid=$this->sid");
 		$this->assertContainsLang('BOARDRULES_HEADER', $crawler->filter('h2')->text());
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ protected function visit_rules_as_admin()`
`22`	`22`	`{`
`23`	`23`	`$db = $this->get_db();`
`24`	`24`
`25`		`- // XXX hardcoded user id`
	`25`	`+ // Visit Ideas as user "admin"`
`26`	`26`	`$sql = 'DELETE FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = 2';`
`27`	`27`	`$db->sql_query($sql);`
`28`	`28`
`29`	`29`	`$this->login();`
`30`		`- $crawler = self::request('GET', "index.php/rules?sid=$this->sid");`
	`30`	`+ $crawler = self::request('GET', "app.php/rules?sid=$this->sid");`
`31`	`31`	`$this->assertContainsLang('BOARDRULES_HEADER', $crawler->filter('h2')->text());`
`32`	`32`	`}`
`33`	`33`