Merge branch 'MDL-70237-310' of git://github.com/rezaies/moodle into …

…MOODLE_310_STABLE
moodle · Nov 26, 2020 · f03c875 · f03c875
2 parents 9fcb5ec + a9b83b3
commit f03c875
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/payment/classes/external/get_available_gateways.php b/payment/classes/external/get_available_gateways.php
@@ -96,7 +96,7 @@ public static function execute_returns(): external_multiple_structure {
                 new external_single_structure([
                     'shortname' => new external_value(PARAM_PLUGIN, 'Name of the plugin'),
                     'name' => new external_value(PARAM_TEXT, 'Human readable name of the gateway'),
-                    'description' => new external_value(PARAM_TEXT, 'description of the gateway'),
+                    'description' => new external_value(PARAM_RAW, 'description of the gateway'),
                     'surcharge' => new external_value(PARAM_INT, 'percentage of surcharge when using the gateway'),
                     'cost' => new external_value(PARAM_TEXT,
                         'Cost in human-readable form (amount plus surcharge with currency sign)'),

diff --git a/payment/gateway/paypal/db/install.php b/payment/gateway/paypal/db/install.php
@@ -23,6 +23,8 @@
  */
 
 function xmldb_paygw_paypal_install() {
+    global $CFG;
+
     // Enable the Paypal payment gateway on installation. It still needs to be configured and enabled for accounts.
     $order = (!empty($CFG->paygw_plugins_sortorder)) ? explode(',', $CFG->paygw_plugins_sortorder) : [];
     set_config('paygw_plugins_sortorder', join(',', array_merge($order, ['paypal'])));

diff --git a/payment/templates/gateway.mustache b/payment/templates/gateway.mustache
@@ -45,7 +45,7 @@
     <input class="custom-control-input" type="radio" name="payby" id="id-payby-{{uniqid}}-{{shortname}}" data-cost="{{cost}}" data-surcharge="{{surcharge}}" value="{{shortname}}" {{#checked}} checked="checked" {{/checked}} />
     <label class="custom-control-label bg-light border p-3 my-3" for="id-payby-{{uniqid}}-{{shortname}}">
         <p class="h3">{{name}}</p>
-        <p class="content mb-2">{{description}}</p>
+        <p class="content mb-2">{{{description}}}</p>
         {{#pix}} img, paygw_{{shortname}} {{/pix}}
     </label>
 </div>