Merge branch 'main' into issue-3911issue-3911

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
index 6bb6ceb..2f57a44 100644
--- a/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php
+++ b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PreferentialAdmission.class.php
+ * PreferentialAdmission.php
  *
  * An admission rule that favors selected courses of study or semesters of study.
  *
@@ -15,9 +15,6 @@
  * @category    Stud.IP
  */
 
-require_once('lib/classes/admission/AdmissionRule.class.php');
-require_once('lib/classes/admission/UserFilter.class.php');
-
 class PreferentialAdmission extends AdmissionRule
 {
     // --- ATTRIBUTES ---
@@ -338,7 +335,7 @@ class PreferentialAdmission extends AdmissionRule
      */
     public function getTemplate()
     {
-        $factory = new Flexi_TemplateFactory(__DIR__.'/templates/');
+        $factory = new Flexi\Factory(__DIR__.'/templates/');
         // Now open specific template for this rule and insert base template.
         $tpl = $factory->open('configure');
         $tpl->set_attribute('rule', $this);
@@ -503,7 +500,7 @@ class PreferentialAdmission extends AdmissionRule
      */
     public function toString()
     {
-        $factory = new Flexi_TemplateFactory(__DIR__.'/templates/');
+        $factory = new Flexi\Factory(__DIR__.'/templates/');
         $tpl = $factory->open('info');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();