From b94eb1aaf3490b563aad2f8da13ef866d21304ae Mon Sep 17 00:00:00 2001
From: Ross Parker <>
Date: Thu, 27 Feb 2025 15:07:42 +0800
Subject: [PATCH] v5.25.07

---
 Free Learning/CHANGEDB.php                     |  5 +++++
 Free Learning/CHANGELOG.txt                    |  4 ++++
 Free Learning/manifest.php                     |  2 +-
 Free Learning/units_browse_details.php         |  2 +-
 Free Learning/units_mentor_approval.php        | 13 +++++++------
 Free Learning/units_mentor_approvalProcess.php |  6 +++---
 Free Learning/version.php                      |  2 +-
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Free Learning/CHANGEDB.php b/Free Learning/CHANGEDB.php
index 682eec5..fca9277 100644
--- a/Free Learning/CHANGEDB.php	
+++ b/Free Learning/CHANGEDB.php	
@@ -2360,3 +2360,8 @@
 ++$count;
 $sql[$count][0] = '5.25.06';
 $sql[$count][1] = "";
+
+//v5.25.07
+++$count;
+$sql[$count][0] = '5.25.07';
+$sql[$count][1] = "";
diff --git a/Free Learning/CHANGELOG.txt b/Free Learning/CHANGELOG.txt
index 0af2cf6..c1fb8fa 100644
--- a/Free Learning/CHANGELOG.txt	
+++ b/Free Learning/CHANGELOG.txt	
@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v5.25.07
+-------
+Fixed PHP mangling in Unit Mentor files
+
 v5.25.06
 -------
 Improved performance of scripts with the Big Data setting turned on
diff --git a/Free Learning/manifest.php b/Free Learning/manifest.php
index 5f9650b..d2bc58e 100644
--- a/Free Learning/manifest.php	
+++ b/Free Learning/manifest.php	
@@ -27,7 +27,7 @@
 $entryURL = 'units_browse.php';
 $type = 'Additional';
 $category = 'Learn';
-$version = '5.25.06';
+$version = '5.25.07';
 $author = "Gibbon Foundation";
 $url = "https://gibbonedu.org";
 
diff --git a/Free Learning/units_browse_details.php b/Free Learning/units_browse_details.php
index 9910f3a..fe9f6bc 100755
--- a/Free Learning/units_browse_details.php	
+++ b/Free Learning/units_browse_details.php	
@@ -492,7 +492,7 @@
 
                             $table->addColumn('classMentor', __m('Class/Mentor'))
                                 ->description(__m('Grouping'))
-                                ->sortable(['course', 'class', 'surname', 'preferredName'])
+                                ->sortable(['course', 'class'])
                                 ->width('20%')
                                 ->format(function ($student) use (&$collaborationKeys) {
                                     $return = '';
diff --git a/Free Learning/units_mentor_approval.php b/Free Learning/units_mentor_approval.php
index f26dc0e..96bc32a 100755
--- a/Free Learning/units_mentor_approval.php	
+++ b/Free Learning/units_mentor_approval.php	
@@ -1,10 +1,5 @@
 <?php
-
-use Gibbon\View\View;
-use Gibbon\Forms\Form;
-use Gibbon\Services\Format;
-use Gibbon\Domain\System\SettingGateway;
-use Gibbon\Module\FreeLearning\Domain\UnitStudentGateway;
+/*
 Gibbon: the flexible, open school platform
 Founded by Ross Parker at ICHK Secondary. Built by Ross Parker, Sandra Kuipers and the Gibbon community (https://gibbonedu.org/about/)
 Copyright © 2010, Gibbon Foundation
@@ -24,6 +19,12 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+use Gibbon\View\View;
+use Gibbon\Forms\Form;
+use Gibbon\Services\Format;
+use Gibbon\Domain\System\SettingGateway;
+use Gibbon\Module\FreeLearning\Domain\UnitStudentGateway;
+
 // Module includes
 require_once __DIR__ . '/moduleFunctions.php';
 
diff --git a/Free Learning/units_mentor_approvalProcess.php b/Free Learning/units_mentor_approvalProcess.php
index 260c93b..dff8f07 100755
--- a/Free Learning/units_mentor_approvalProcess.php	
+++ b/Free Learning/units_mentor_approvalProcess.php	
@@ -1,7 +1,5 @@
 <?php
-
-use Gibbon\Domain\System\DiscussionGateway;
-use Gibbon\Module\FreeLearning\Domain\UnitStudentGateway;
+/*
 Gibbon: the flexible, open school platform
 Founded by Ross Parker at ICHK Secondary. Built by Ross Parker, Sandra Kuipers and the Gibbon community (https://gibbonedu.org/about/)
 Copyright © 2010, Gibbon Foundation
@@ -22,6 +20,8 @@
 */
 
 use Gibbon\Domain\System\SettingGateway;
+use Gibbon\Domain\System\DiscussionGateway;
+use Gibbon\Module\FreeLearning\Domain\UnitStudentGateway;
 
 require_once '../../gibbon.php';
 
diff --git a/Free Learning/version.php b/Free Learning/version.php
index c1f5b42..f721145 100755
--- a/Free Learning/version.php	
+++ b/Free Learning/version.php	
@@ -22,5 +22,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '5.25.06';
+$moduleVersion = '5.25.07';
 $coreVersion = '28.0.00';