Merge pull request #1 from LadySolveig/master

Update jpeljpeg.php
Quantum-Manager · Jul 18, 2022 · 6ad2e0f · 6ad2e0f
2 parents 5b97afe + 0af5ebb
commit 6ad2e0f
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/jpeljpeg.php b/jpeljpeg.php
@@ -9,6 +9,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Version;
 use lsolesen\pel\PelDataWindow;
 use lsolesen\pel\PelEntryAscii;
 use lsolesen\pel\PelEntryUndefined;
@@ -41,7 +42,15 @@ class JPelJpeg implements JPelInterface
      */
     public function __construct($file)
     {
-        JLoader::registerNamespace('lsolesen\pel', JPATH_LIBRARIES . DIRECTORY_SEPARATOR . 'jpel');
+        $jversion = new Version();
+        if (version_compare($jversion->getShortVersion(), '4.0', '<')) {
+			// only for Joomla 3.x
+                JLoader::registerNamespace('lsolesen\pel', JPATH_LIBRARIES . DIRECTORY_SEPARATOR . 'jpel');
+
+		} else {
+			// only for Joomla 4.x
+            JLoader::registerNamespace('lsolesen\pel', JPATH_LIBRARIES . DIRECTORY_SEPARATOR . 'jpel'. DIRECTORY_SEPARATOR . 'lsolesen'. DIRECTORY_SEPARATOR . 'pel');
+		}
         $data = new PelDataWindow(file_get_contents($file));
 
         $this->file = $file;
@@ -152,4 +161,4 @@ public function save($file)
         $this->jpeg->saveFile($file);
     }
 
-}
+}