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

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
index 63275f0..640e800 100644
--- a/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php
+++ b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ConditionalAdmission.class.php
+ * ConditionalAdmission.php
  *
  * An admission rule that specifies conditions for course admission, like
  * degree, study course or semester.
@@ -207,7 +207,7 @@ class ConditionalAdmission extends AdmissionRule
         // Open generic admission rule template.
         $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
         $tpl->set_attribute('rule', $this);
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(__DIR__ . '/templates/');
         // Now open specific template for this rule and insert base template.
         $tpl2 = $factory->open('configure');
         $tpl2->set_attribute('rule', $this);
@@ -471,7 +471,7 @@ class ConditionalAdmission extends AdmissionRule
      */
     public function toString()
     {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(__DIR__ . '/templates/');
         $tpl = $factory->open('info');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();