Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

ChangeLog

@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - issue        Table list not saved in db QBE bookmarked search
 - issue #11777 While 'changing a column', query fails with a syntax error after the 'CHARSET=' keyword
 - issue #11783 Avoid syntax error in javascript messages on invalid PHP setting for max_input_vars
+- issue #11784 Properly handle errors in upacking zip archive
 
 4.5.3.1 (2015-12-25)
 - issue #11774 Undefined offset 2

libraries/zip_extension.lib.php

@@ -26,7 +26,6 @@ function PMA_getZipContents($file, $specific_entry = null)
     if (!is_resource($zip_handle)) {
         $error_message = __('Error in ZIP archive:')
             . ' ' . PMA_getZipError($zip_handle);
-        zip_close($zip_handle);
         return (array('error' => $error_message, 'data' => $file_data));
     }