Changeset 554 for trunk/Modules

Timestamp:

Jul 29, 2013, 9:25:33 PM (12 years ago)

Author:

chronos

Message:

• Fixed: Error in user profile page if user id is not given.
• Fixed: Error in translation list view if translation group item filter is empty.
• Fixed: SQL constraint error in case of export deletion which have records in related tables.
• Fixed: Error when table ordering parameter contain invalid value.

Location:

trunk/Modules

Files:

• Translation/Save.php (modified) (1 diff)
• User/Profile.php (modified) (2 diffs)

trunk/Modules/Translation/Save.php

@@ -45 +45 @@
           if(($GroupItem['Visible'] == 1) and ($EnglishText[$GroupItem['Column']] != ''))
             $Filter .= ' OR (`'.$GroupItem['Column'].'` = "'.addslashes($EnglishText[$GroupItem['Column']]).'")';
-        $Filter = ' AND ('.substr($Filter, 3).')';
+        if(substr($Filter, 0, 3) == ' OR') $Filter = ' AND ('.substr($Filter, 3).')';
         
         $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$Config['OriginalLanguage'].')'.$Filter);

trunk/Modules/User/Profile.php

@@ -41 +41 @@
                                 'LEFT JOIN `Team` ON `Team`.`Id` = `User`.`Team` '.
                                 'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
-                                'WHERE `User`.`Id` = '.$_GET['user'];
+                                'WHERE `User`.`Id` = '.($_GET['user'] * 1);
                 $DbResult = $this->Database->query($Query);
+                if($DbResult->num_rows > 0)
+                {
                 $UserLine = $DbResult->fetch_array();
                  
@@ -76 +78 @@
                                         '</div></form></fieldset>';
                 }
+                } else $Output .= ShowMessage('Uživatel nenalezen', MESSAGE_CRITICAL);
                 return($Output);
         }