CLI - switch blog to saved blog id

Tymotey · Tymotey · commit 32a2b4fe488c · 2024-07-05T16:16:46.000+03:00
diff --git a/src/router.cls.php b/src/router.cls.php
@@ -512,14 +512,15 @@ private function verify_action()
 				return;
 			}
 
+			$save_blog = get_current_blog_id();
 			if ($_REQUEST['switch_blog']) {
 				// If request parameter "switch_blog", switch to correct blog to generate hash.
 				switch_to_blog($_REQUEST['switch_blog']);
 			}
 			$hash = Router::get_hash(self::VALIDATE_PURGE);
 			if ($_REQUEST['switch_blog']) {
 				// Restore blog if needed.
-				restore_current_blog();
+				switch_to_blog($save_blog);
 			}
 			
 

Original file line number	Diff line number	Diff line change
`@@ -512,14 +512,15 @@ private function verify_action()`
`512`	`512`	`return;`
`513`	`513`	`}`
`514`	`514`
	`515`	`+ $save_blog = get_current_blog_id();`
`515`	`516`	`if ($_REQUEST['switch_blog']) {`
`516`	`517`	`// If request parameter "switch_blog", switch to correct blog to generate hash.`
`517`	`518`	`switch_to_blog($_REQUEST['switch_blog']);`
`518`	`519`	`}`
`519`	`520`	`$hash = Router::get_hash(self::VALIDATE_PURGE);`
`520`	`521`	`if ($_REQUEST['switch_blog']) {`
`521`	`522`	`// Restore blog if needed.`
`522`		`- restore_current_blog();`
	`523`	`+ switch_to_blog($save_blog);`
`523`	`524`	`}`
`524`	`525`
`525`	`526`