Fixed issue #17376: Remove duplicate of pclzip

LimeSurvey · Jun 21, 2021 · d501a6e · d501a6e
1 parent 5e9f7a4
commit d501a6e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5,726 deletions.
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
@@ -901,7 +901,7 @@ public function exportMultipleSurveys($sSurveys, $sExportType)
     {
         $aSurveys = json_decode($sSurveys);
         $aResults = array();
-        Yii::import('application.libraries.admin.pclzip', true);
+        Yii::app()->loadLibrary('admin.pclzip');
         $bArchiveIsEmpty = true;
         $sTempDir        = Yii::app()->getConfig("tempdir");
         $sZip            = randomChars(30);
@@ -1019,7 +1019,7 @@ private function _exportarchive($iSurveyID, $bSendToBrowser = true)
         $sLSTFileName = $sTempDir . DIRECTORY_SEPARATOR . randomChars(30);
         $sLSIFileName = $sTempDir . DIRECTORY_SEPARATOR . randomChars(30);
 
-        Yii::import('application.libraries.admin.pclzip', true);
+        Yii::app()->loadLibrary('admin.pclzip');
         $zip = new PclZip($aZIPFileName);
 
         file_put_contents($sLSSFileName, surveyGetXMLData($iSurveyID));

diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -1248,7 +1248,7 @@ function importSurveyFile($sFullFilePath, $bTranslateLinksFields, $sNewSurveyNam
             return $aImportResults;
         case 'lsa':
             // Import a survey archive
-            Yii::import("application.libraries.admin.pclzip.pclzip", true);
+            Yii::app()->loadLibrary('admin.pclzip');
             $pclzip = new PclZip(array('p_zipname' => $sFullFilePath));
             $aFiles = $pclzip->listContent();