fiexed OES-207

huridocs · Jul 25, 2013 · 01dec0b · 01dec0b
1 parent 8dce5d1
commit 01dec0b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/data/Browse.php b/data/Browse.php
@@ -1033,14 +1033,13 @@ public static function getHuriTermsTranslations($fieldName, $langorder = null) {
         $res = $browse->ExecuteQuery($sql);
         $results = array();
         foreach ($res as $record) {
-            if (isset($results[$record["vocab_number"]])) {
-                $results[$record["vocab_number"]]["label_" . $record["locale"]] = $record["msgstr"];
-            } else {
+            if (!isset($results[$record["vocab_number"]])) {
                 $results[$record["vocab_number"]] = $record;
-                if ($record["locale"] != "en") {
-                    $results[$record["vocab_number"]]["label_" . $record["locale"]] = $record["msgstr"];
-                }
             }
+            if ($record["locale"] != "en") {
+                $results[$record["vocab_number"]]["label_" . $record["locale"]] = $record["msgstr"];
+            }
+
         }
 
         return $results;

diff --git a/mod/admin/adminModule.class.php b/mod/admin/adminModule.class.php
@@ -478,7 +478,7 @@ public function act_mt_customization() {
 
         if (isset($this->mt_select)) {
             //handle delete requests
-			if(isset($_POST['bulkaction']) && !$_POST['vocab_number_list']){
+            		if($_POST['bulkaction'] && !$_POST['vocab_number_list']){
 				shnMessageQueue::addError(_t('Please select items to performa action'));
 
 			}