Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NFC] dev/core#1466 Update Documentation URLS to be the correct links… #16085

Merged
merged 1 commit into from
Feb 19, 2020

Conversation

seamuslee001
Copy link
Contributor

… in the security component check

Overview

Updates the documentation links from pointing at the Wiki to be pointing at the mkdocs

ping @MikeyMJCO @eileenmcnaughton

@civibot
Copy link

civibot bot commented Dec 11, 2019

(Standard links)

@civibot civibot bot added the master label Dec 11, 2019
@@ -364,7 +364,7 @@ public function isDirAccessible($dir, $url) {
* @return string
*/
public function createDocUrl($topic) {
return CRM_Utils_System::getWikiBaseURL() . $topic;
return CRM_Utils_System::docURL2('sysadmin/setup/security#' . $topic, TRUE);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return CRM_Utils_System::docURL2('sysadmin/setup/security#' . $topic, TRUE);
return CRM_Utils_System::docURL2('sysadmin/setup/security#' . $topic, TRUE);

where is "docurl2" defined as a function?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -71,7 +71,7 @@ public function checkLogFileIsNotAccessible() {
$url[] = $log_path[1];
$log_url = implode($filePathMarker, $url);
if ($this->fileExists($log_url)) {
$docs_url = $this->createDocUrl('checkLogFileIsNotAccessible');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I enter https://wiki.civicrm.org/confluence/display/CRMDOC//uploads-should-not-be-accessible I get a 404 - unchanged I get redirected to the security page on the docs - ie the equivalent of

return CRM_Utils_System::docURL2('sysadmin/setup/security#' . $topic, TRUE);

So this change make it un-better

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't that what L367 is meant to be doing?)

@jaapjansma
Copy link
Contributor

Betty and I are reviewing PR's and we came across this PR.

We are unable to reproduce this PR as it is not clearly explained. However we do think this PR is ready to be merged as it is only updating non-working links to the CiviCRM documentation. So not a risk of breaking anything. And if it breaks then it breaks existing broken links.

@eileenmcnaughton or @mattwire could one of you merge this PR?

@mattwire
Copy link
Contributor

Merging based on @jaapjansma review @seamuslee001 please follow up with a subsequent PR if there are still broken links (per @eileenmcnaughton comment above)

@mattwire mattwire merged commit 2a494ac into civicrm:master Feb 19, 2020
@homotechsual
Copy link
Contributor

Note: We can refactor the underlying system here next year - we'll be adding metadata (catogorisation/tags) to docs (2020) and an API to pull docs information in UI along with an extension using it planned for 2021.

@eileenmcnaughton eileenmcnaughton deleted the dev_core_1466 branch February 19, 2020 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants