Merge pull request #69 from oat-sa/release-4.2.1

Release 4.2.1
oat-sa · Mar 22, 2018 · 4546a7a · 4546a7a
2 parents 754782d + 2b5e868
commit 4546a7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/manifest.php b/manifest.php
@@ -24,7 +24,7 @@
     'label' => 'extension-tao-outcomerds',
     'description' => 'extension that allows a storage in relational database',
     'license' => 'GPL-2.0',
-    'version' => '4.2.0',
+    'version' => '4.2.1',
     'author' => 'Open Assessment Technologies SA',
     'requires' => array(
         'taoResultServer' => '>=6.2.0',

diff --git a/model/RdsResultStorage.php b/model/RdsResultStorage.php
@@ -482,10 +482,8 @@ public function getResultByDelivery($delivery, $options = array())
         }
 
 
-        if(isset($options['order'])){
-
-            $sql .= ' ORDER BY ?';
-            $params[] = $options['order'];
+        if(isset($options['order']) && in_array($options['order'], [self::DELIVERY_COLUMN, self::TEST_TAKER_COLUMN, self::RESULTS_TABLE_ID])){
+            $sql .= ' ORDER BY ' . $options['order'];
             if(isset($options['orderdir']) && (strtolower($options['orderdir']) === 'asc' || strtolower($options['orderdir']) === 'desc')) {
                 $sql .= ' ' . $options['orderdir'];
             }

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -131,6 +131,6 @@ public function update($initialVersion) {
             $this->setVersion('2.2.0');
         }
 
-		$this->skip('2.2.0','4.2.0');
+		$this->skip('2.2.0','4.2.1');
 	}
 }