From 8a55c96dab8090d3dfe6a1b2264078856683a5e7 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Wed, 11 Mar 2015 00:39:56 -0700 Subject: [PATCH] Removed unnecessary function We were supporting older versions of Moodle so it was necessary if we only wanted one branch. --- element/image/lib.php | 2 +- element/userfield/lib.php | 2 +- locallib.php | 15 +-------------- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/element/image/lib.php b/element/image/lib.php index f966c7e..1967484 100644 --- a/element/image/lib.php +++ b/element/image/lib.php @@ -161,7 +161,7 @@ class customcert_element_image extends customcert_element_base { } } - customcert_perform_asort($arrfiles); + core_collator::asort($arrfiles); $arrfiles = array_merge(array('0' => get_string('noimage', 'customcert')), $arrfiles); return $arrfiles; diff --git a/element/userfield/lib.php b/element/userfield/lib.php index 8fc52db..3f80b98 100644 --- a/element/userfield/lib.php +++ b/element/userfield/lib.php @@ -61,7 +61,7 @@ class customcert_element_userfield extends customcert_element_base { } // Combine the two. $fields = $userfields + $customfields; - customcert_perform_asort($fields); + core_collator::asort($fields); // Create the select box where the user field is selected. $mform->addElement('select', 'userfield', get_string('userfield', 'customcertelement_userfield'), $fields); diff --git a/locallib.php b/locallib.php index cafd8d0..1eac578 100644 --- a/locallib.php +++ b/locallib.php @@ -119,7 +119,7 @@ function customcert_get_elements() { } } - customcert_perform_asort($options); + core_collator::asort($options); return $options; } @@ -713,16 +713,3 @@ function customcert_generate_report_file($customcert, $users, $type) { // Close the workbook. $workbook->close(); } - -/** - * Perform asort on a given array. - * - * @param array $fields - */ -function customcert_perform_asort(&$fields) { - if (class_exists('core_collator')) { - core_collator::asort($fields); - } else { - collatorlib::asort($fields); - } -}