From 6f55e2a83f52cca8b52651b4ad4c22e52dba7971 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 2 Jul 2020 16:42:07 -0400 Subject: [PATCH] Fix some outdated wiki links --- CRM/Core/Form.php | 2 +- CRM/Core/Resources.php | 2 +- CRM/Upgrade/Page/Cleanup.php | 2 +- ang/crmUtil.js | 2 +- js/crm.ajax.js | 3 ++- js/crm.datepicker.js | 2 +- templates/CRM/common/civicrm.settings.php.template | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php index 1593043ec918..ce97e2c65553 100644 --- a/CRM/Core/Form.php +++ b/CRM/Core/Form.php @@ -385,7 +385,7 @@ public function &add( unset($attributes['multiple']); $extra = NULL; } - // @see http://wiki.civicrm.org/confluence/display/CRMDOC/crmDatepicker + // @see https://docs.civicrm.org/dev/en/latest/framework/ui/#date-picker if ($type == 'datepicker') { // Support minDate/maxDate properties if (isset($extra['minDate'])) { diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php index 581447c2b638..40dd3b09782f 100644 --- a/CRM/Core/Resources.php +++ b/CRM/Core/Resources.php @@ -258,7 +258,7 @@ public function addScript($code, $weight = self::DEFAULT_WEIGHT, $region = self: * Access var from javascript: * CRM.vars.myNamespace.foo // "bar" * - * @see http://wiki.civicrm.org/confluence/display/CRMDOC/Javascript+Reference + * @see https://docs.civicrm.org/dev/en/latest/standards/javascript/ * * @param string $nameSpace * Usually the name of your extension. diff --git a/CRM/Upgrade/Page/Cleanup.php b/CRM/Upgrade/Page/Cleanup.php index 7a746b7a8276..ece1c2aa141d 100644 --- a/CRM/Upgrade/Page/Cleanup.php +++ b/CRM/Upgrade/Page/Cleanup.php @@ -38,7 +38,7 @@ public function cleanup425() { $postMessage = ts('You can click here to try running the 4.2 upgrade script again. (Review upgrade documentation)', [ 1 => CRM_Utils_System::url('civicrm/upgrade', 'reset=1'), - 2 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Installation+and+Upgrades', + 2 => CRM_Utils_System::docURL2('sysadmin/upgrade', TRUE), ]); $template->assign('postMessage', $postMessage); diff --git a/ang/crmUtil.js b/ang/crmUtil.js index ab460ab7e9c5..bbdbe4652db4 100644 --- a/ang/crmUtil.js +++ b/ang/crmUtil.js @@ -3,7 +3,7 @@ angular.module('crmUtil', CRM.angRequires('crmUtil')); // Angular implementation of CRM.api3 - // @link http://wiki.civicrm.org/confluence/display/CRMDOC/AJAX+Interface#AJAXInterface-CRM.api3 + // @link https://docs.civicrm.org/dev/en/latest/api/interfaces/#angularjs // // Note: To mock API results in unit-tests, override crmApi.backend, e.g. // var apiSpy = jasmine.createSpy('crmApi'); diff --git a/js/crm.ajax.js b/js/crm.ajax.js index bfff407843dc..7c7371131125 100644 --- a/js/crm.ajax.js +++ b/js/crm.ajax.js @@ -56,6 +56,7 @@ return result; } + // https://docs.civicrm.org/dev/en/latest/api/interfaces/#ajax CRM.api4 = function(entity, action, params, index) { return new Promise(function(resolve, reject) { if (typeof entity === 'string') { @@ -88,7 +89,7 @@ /** * AJAX api - * @link http://wiki.civicrm.org/confluence/display/CRMDOC/AJAX+Interface#AJAXInterface-CRM.api3 + * @link https://docs.civicrm.org/dev/en/latest/api/interfaces/#ajax */ CRM.api3 = function(entity, action, params, status) { if (typeof(entity) === 'string') { diff --git a/js/crm.datepicker.js b/js/crm.datepicker.js index 3a8eebbc9bdc..d630834c5c0b 100644 --- a/js/crm.datepicker.js +++ b/js/crm.datepicker.js @@ -2,7 +2,7 @@ "use strict"; /** - * @see http://wiki.civicrm.org/confluence/display/CRMDOC/crmDatepicker + * @see https://docs.civicrm.org/dev/en/latest/framework/ui/#date-picker */ $.fn.crmDatepicker = function(options) { return $(this).each(function() { diff --git a/templates/CRM/common/civicrm.settings.php.template b/templates/CRM/common/civicrm.settings.php.template index 6bdab4ec760b..28102ccd78ea 100644 --- a/templates/CRM/common/civicrm.settings.php.template +++ b/templates/CRM/common/civicrm.settings.php.template @@ -235,7 +235,7 @@ if (!defined('CIVICRM_UF_BASEURL')) { } /** - * Define any CiviCRM Settings Overrides per http://wiki.civicrm.org/confluence/display/CRMDOC/Override+CiviCRM+Settings + * Define any CiviCRM Settings Overrides per https://docs.civicrm.org/sysadmin/en/latest/customize/settings/ * * Uncomment and edit the below as appropriate. */