Merge pull request phpbb#6629 from marc1706/ticket/17328

marc1706 · web-flow · commit b5d1d03a47b2 · 2024-06-02T08:09:43.000+02:00
[ticket/17328] Update requires for exporting events
diff --git a/phpBB/develop/export_events_for_bbcode.php b/phpBB/develop/export_events_for_bbcode.php
@@ -65,7 +65,8 @@ function validate_argument_count($arguments, $count)
 require __DIR__ . '/../phpbb/event/rst_exporter.' . $phpEx;
 require __DIR__ . '/../includes/functions.' . $phpEx;
 require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx;
-require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx;
 
 switch ($action)
 {
diff --git a/phpBB/develop/export_events_for_rst.php b/phpBB/develop/export_events_for_rst.php
@@ -68,7 +68,8 @@ function validate_argument_count($arguments, $count)
 require __DIR__ . '/../phpbb/event/rst_exporter.' . $phpEx;
 require __DIR__ . '/../includes/functions.' . $phpEx;
 require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx;
-require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx;
 
 switch ($action)
 {
diff --git a/phpBB/develop/export_events_for_wiki.php b/phpBB/develop/export_events_for_wiki.php
@@ -67,7 +67,8 @@ function validate_argument_count($arguments, $count)
 require __DIR__ . '/../phpbb/event/md_exporter.' . $phpEx;
 require __DIR__ . '/../includes/functions.' . $phpEx;
 require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx;
-require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx;
 
 switch ($action)
 {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ function validate_argument_count($arguments, $count)`
`65`	`65`	`require __DIR__ . '/../phpbb/event/rst_exporter.' . $phpEx;`
`66`	`66`	`require __DIR__ . '/../includes/functions.' . $phpEx;`
`67`	`67`	`require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx;`
`68`		`-require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx;`
	`68`	`+require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx;`
	`69`	`+require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx;`
`69`	`70`
`70`	`71`	`switch ($action)`
`71`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ function validate_argument_count($arguments, $count)`
`68`	`68`	`require __DIR__ . '/../phpbb/event/rst_exporter.' . $phpEx;`
`69`	`69`	`require __DIR__ . '/../includes/functions.' . $phpEx;`
`70`	`70`	`require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx;`
`71`		`-require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx;`
	`71`	`+require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx;`
	`72`	`+require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx;`
`72`	`73`
`73`	`74`	`switch ($action)`
`74`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ function validate_argument_count($arguments, $count)`
`67`	`67`	`require __DIR__ . '/../phpbb/event/md_exporter.' . $phpEx;`
`68`	`68`	`require __DIR__ . '/../includes/functions.' . $phpEx;`
`69`	`69`	`require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx;`
`70`		`-require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx;`
	`70`	`+require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx;`
	`71`	`+require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx;`
`71`	`72`
`72`	`73`	`switch ($action)`
`73`	`74`	`{`