From 9b4743c028e5037cc831ac24f5568fb0a470d652 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 12 Aug 2024 21:17:52 +0100 Subject: [PATCH 1/3] [ticket/17382] Update the find a member FAQ text to fix grammar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated the text of an answer on the FAQ page that explained how to search for members on the forum. Originally the text read as `Visit to the “Members” page` which is grammatically incorrect, specifically `visit to the`. PHPBB-17382 --- phpBB/{install => $install}/app.php | 0 phpBB/{install => $install}/convert/controller/convertor.php | 0 phpBB/{install => $install}/convert/convert.php | 0 phpBB/{install => $install}/convert/convertor.php | 0 phpBB/{install => $install}/convertors/convert_phpbb20.php | 0 phpBB/{install => $install}/convertors/functions_phpbb20.php | 0 phpBB/{install => $install}/data/confusables.php | 0 phpBB/{install => $install}/index.html | 0 phpBB/{install => $install}/phpbbcli.php | 0 phpBB/{install => $install}/phpinfo.php | 0 phpBB/{install => $install}/schemas/index.htm | 0 phpBB/{install => $install}/schemas/oracle_schema.sql | 0 phpBB/{install => $install}/schemas/postgres_schema.sql | 0 phpBB/{install => $install}/schemas/schema_data.sql | 0 phpBB/{install => $install}/startup.php | 0 phpBB/language/en/help/faq.php | 2 +- 16 files changed, 1 insertion(+), 1 deletion(-) rename phpBB/{install => $install}/app.php (100%) rename phpBB/{install => $install}/convert/controller/convertor.php (100%) rename phpBB/{install => $install}/convert/convert.php (100%) rename phpBB/{install => $install}/convert/convertor.php (100%) rename phpBB/{install => $install}/convertors/convert_phpbb20.php (100%) rename phpBB/{install => $install}/convertors/functions_phpbb20.php (100%) rename phpBB/{install => $install}/data/confusables.php (100%) rename phpBB/{install => $install}/index.html (100%) rename phpBB/{install => $install}/phpbbcli.php (100%) rename phpBB/{install => $install}/phpinfo.php (100%) rename phpBB/{install => $install}/schemas/index.htm (100%) rename phpBB/{install => $install}/schemas/oracle_schema.sql (100%) rename phpBB/{install => $install}/schemas/postgres_schema.sql (100%) rename phpBB/{install => $install}/schemas/schema_data.sql (100%) rename phpBB/{install => $install}/startup.php (100%) diff --git a/phpBB/install/app.php b/phpBB/$install/app.php similarity index 100% rename from phpBB/install/app.php rename to phpBB/$install/app.php diff --git a/phpBB/install/convert/controller/convertor.php b/phpBB/$install/convert/controller/convertor.php similarity index 100% rename from phpBB/install/convert/controller/convertor.php rename to phpBB/$install/convert/controller/convertor.php diff --git a/phpBB/install/convert/convert.php b/phpBB/$install/convert/convert.php similarity index 100% rename from phpBB/install/convert/convert.php rename to phpBB/$install/convert/convert.php diff --git a/phpBB/install/convert/convertor.php b/phpBB/$install/convert/convertor.php similarity index 100% rename from phpBB/install/convert/convertor.php rename to phpBB/$install/convert/convertor.php diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/$install/convertors/convert_phpbb20.php similarity index 100% rename from phpBB/install/convertors/convert_phpbb20.php rename to phpBB/$install/convertors/convert_phpbb20.php diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/$install/convertors/functions_phpbb20.php similarity index 100% rename from phpBB/install/convertors/functions_phpbb20.php rename to phpBB/$install/convertors/functions_phpbb20.php diff --git a/phpBB/install/data/confusables.php b/phpBB/$install/data/confusables.php similarity index 100% rename from phpBB/install/data/confusables.php rename to phpBB/$install/data/confusables.php diff --git a/phpBB/install/index.html b/phpBB/$install/index.html similarity index 100% rename from phpBB/install/index.html rename to phpBB/$install/index.html diff --git a/phpBB/install/phpbbcli.php b/phpBB/$install/phpbbcli.php similarity index 100% rename from phpBB/install/phpbbcli.php rename to phpBB/$install/phpbbcli.php diff --git a/phpBB/install/phpinfo.php b/phpBB/$install/phpinfo.php similarity index 100% rename from phpBB/install/phpinfo.php rename to phpBB/$install/phpinfo.php diff --git a/phpBB/install/schemas/index.htm b/phpBB/$install/schemas/index.htm similarity index 100% rename from phpBB/install/schemas/index.htm rename to phpBB/$install/schemas/index.htm diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/$install/schemas/oracle_schema.sql similarity index 100% rename from phpBB/install/schemas/oracle_schema.sql rename to phpBB/$install/schemas/oracle_schema.sql diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/$install/schemas/postgres_schema.sql similarity index 100% rename from phpBB/install/schemas/postgres_schema.sql rename to phpBB/$install/schemas/postgres_schema.sql diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/$install/schemas/schema_data.sql similarity index 100% rename from phpBB/install/schemas/schema_data.sql rename to phpBB/$install/schemas/schema_data.sql diff --git a/phpBB/install/startup.php b/phpBB/$install/startup.php similarity index 100% rename from phpBB/install/startup.php rename to phpBB/$install/startup.php diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php index 6b165da0f8..aebd093865 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -158,7 +158,7 @@ $lang = array_merge($lang, array( 'HELP_FAQ_SEARCH_BLANK_QUESTION' => 'Why does my search return a blank page!?', 'HELP_FAQ_SEARCH_FORUM_ANSWER' => 'Enter a search term in the search box located on the index, forum or topic pages. Advanced search can be accessed by clicking the “Advance Search” link which is available on all pages on the forum. How to access the search may depend on the style used.', 'HELP_FAQ_SEARCH_FORUM_QUESTION' => 'How can I search a forum or forums?', - 'HELP_FAQ_SEARCH_MEMBERS_ANSWER' => 'Visit to the “Members” page and click the “Find a member” link.', + 'HELP_FAQ_SEARCH_MEMBERS_ANSWER' => 'Visit the members page and select the \'Find a member\' link.', 'HELP_FAQ_SEARCH_MEMBERS_QUESTION' => 'How do I search for members?', 'HELP_FAQ_SEARCH_NO_RESULT_ANSWER' => 'Your search was probably too vague and included many common terms which are not indexed by phpBB. Be more specific and use the options available within Advanced search.', 'HELP_FAQ_SEARCH_NO_RESULT_QUESTION' => 'Why does my search return no results?', From 331bea8b22a4d1f76a87a0af662c555166fec158 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 12 Aug 2024 21:21:14 +0100 Subject: [PATCH 2/3] [ticket/17382] Undo rename of install folder to check front-end changes! PHPBB-17382 --- phpBB/{$install => install}/app.php | 0 phpBB/{$install => install}/convert/controller/convertor.php | 0 phpBB/{$install => install}/convert/convert.php | 0 phpBB/{$install => install}/convert/convertor.php | 0 phpBB/{$install => install}/convertors/convert_phpbb20.php | 0 phpBB/{$install => install}/convertors/functions_phpbb20.php | 0 phpBB/{$install => install}/data/confusables.php | 0 phpBB/{$install => install}/index.html | 0 phpBB/{$install => install}/phpbbcli.php | 0 phpBB/{$install => install}/phpinfo.php | 0 phpBB/{$install => install}/schemas/index.htm | 0 phpBB/{$install => install}/schemas/oracle_schema.sql | 0 phpBB/{$install => install}/schemas/postgres_schema.sql | 0 phpBB/{$install => install}/schemas/schema_data.sql | 0 phpBB/{$install => install}/startup.php | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename phpBB/{$install => install}/app.php (100%) rename phpBB/{$install => install}/convert/controller/convertor.php (100%) rename phpBB/{$install => install}/convert/convert.php (100%) rename phpBB/{$install => install}/convert/convertor.php (100%) rename phpBB/{$install => install}/convertors/convert_phpbb20.php (100%) rename phpBB/{$install => install}/convertors/functions_phpbb20.php (100%) rename phpBB/{$install => install}/data/confusables.php (100%) rename phpBB/{$install => install}/index.html (100%) rename phpBB/{$install => install}/phpbbcli.php (100%) rename phpBB/{$install => install}/phpinfo.php (100%) rename phpBB/{$install => install}/schemas/index.htm (100%) rename phpBB/{$install => install}/schemas/oracle_schema.sql (100%) rename phpBB/{$install => install}/schemas/postgres_schema.sql (100%) rename phpBB/{$install => install}/schemas/schema_data.sql (100%) rename phpBB/{$install => install}/startup.php (100%) diff --git a/phpBB/$install/app.php b/phpBB/install/app.php similarity index 100% rename from phpBB/$install/app.php rename to phpBB/install/app.php diff --git a/phpBB/$install/convert/controller/convertor.php b/phpBB/install/convert/controller/convertor.php similarity index 100% rename from phpBB/$install/convert/controller/convertor.php rename to phpBB/install/convert/controller/convertor.php diff --git a/phpBB/$install/convert/convert.php b/phpBB/install/convert/convert.php similarity index 100% rename from phpBB/$install/convert/convert.php rename to phpBB/install/convert/convert.php diff --git a/phpBB/$install/convert/convertor.php b/phpBB/install/convert/convertor.php similarity index 100% rename from phpBB/$install/convert/convertor.php rename to phpBB/install/convert/convertor.php diff --git a/phpBB/$install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php similarity index 100% rename from phpBB/$install/convertors/convert_phpbb20.php rename to phpBB/install/convertors/convert_phpbb20.php diff --git a/phpBB/$install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php similarity index 100% rename from phpBB/$install/convertors/functions_phpbb20.php rename to phpBB/install/convertors/functions_phpbb20.php diff --git a/phpBB/$install/data/confusables.php b/phpBB/install/data/confusables.php similarity index 100% rename from phpBB/$install/data/confusables.php rename to phpBB/install/data/confusables.php diff --git a/phpBB/$install/index.html b/phpBB/install/index.html similarity index 100% rename from phpBB/$install/index.html rename to phpBB/install/index.html diff --git a/phpBB/$install/phpbbcli.php b/phpBB/install/phpbbcli.php similarity index 100% rename from phpBB/$install/phpbbcli.php rename to phpBB/install/phpbbcli.php diff --git a/phpBB/$install/phpinfo.php b/phpBB/install/phpinfo.php similarity index 100% rename from phpBB/$install/phpinfo.php rename to phpBB/install/phpinfo.php diff --git a/phpBB/$install/schemas/index.htm b/phpBB/install/schemas/index.htm similarity index 100% rename from phpBB/$install/schemas/index.htm rename to phpBB/install/schemas/index.htm diff --git a/phpBB/$install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql similarity index 100% rename from phpBB/$install/schemas/oracle_schema.sql rename to phpBB/install/schemas/oracle_schema.sql diff --git a/phpBB/$install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql similarity index 100% rename from phpBB/$install/schemas/postgres_schema.sql rename to phpBB/install/schemas/postgres_schema.sql diff --git a/phpBB/$install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql similarity index 100% rename from phpBB/$install/schemas/schema_data.sql rename to phpBB/install/schemas/schema_data.sql diff --git a/phpBB/$install/startup.php b/phpBB/install/startup.php similarity index 100% rename from phpBB/$install/startup.php rename to phpBB/install/startup.php From 501ecf5dec56f0558d404f81ea8547870c5025ff Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 29 Sep 2024 23:38:09 +0100 Subject: [PATCH 3/3] [ticket/17382] Update FAQ string with new suggestion PHPBB-17382 --- phpBB/language/en/help/faq.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php index aebd093865..c8a0e7e186 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -158,7 +158,7 @@ $lang = array_merge($lang, array( 'HELP_FAQ_SEARCH_BLANK_QUESTION' => 'Why does my search return a blank page!?', 'HELP_FAQ_SEARCH_FORUM_ANSWER' => 'Enter a search term in the search box located on the index, forum or topic pages. Advanced search can be accessed by clicking the “Advance Search” link which is available on all pages on the forum. How to access the search may depend on the style used.', 'HELP_FAQ_SEARCH_FORUM_QUESTION' => 'How can I search a forum or forums?', - 'HELP_FAQ_SEARCH_MEMBERS_ANSWER' => 'Visit the members page and select the \'Find a member\' link.', + 'HELP_FAQ_SEARCH_MEMBERS_ANSWER' => 'Visit the memberlist and click the “Find a member” link.', 'HELP_FAQ_SEARCH_MEMBERS_QUESTION' => 'How do I search for members?', 'HELP_FAQ_SEARCH_NO_RESULT_ANSWER' => 'Your search was probably too vague and included many common terms which are not indexed by phpBB. Be more specific and use the options available within Advanced search.', 'HELP_FAQ_SEARCH_NO_RESULT_QUESTION' => 'Why does my search return no results?',