From 1f71090b8682a5ad30aba3662aa0d2043c121d7c Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 18 Nov 2013 15:37:21 +0100 Subject: [PATCH] // Timeout increased for translation download #PSCFV-11046 --- controllers/admin/AdminTranslationsController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 781581eca..02f8a238f 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -207,8 +207,8 @@ class AdminTranslationsControllerCore extends AdminController $packs_to_update = array(); $token = Tools::getAdminToken('AdminLanguages'.(int)Tab::getIdFromClassName('AdminLanguages').(int)$this->context->employee->id); $file_name = $this->link_lang_pack.'?version='._PS_VERSION_; - $array_stream_context = array('http' => array('method' => 'GET', 'timeout' => 5)); - if ($lang_packs = Tools::file_get_contents($file_name, false, @stream_context_create($array_stream_context))) + $array_stream_context = @stream_context_create(array('http' => array('method' => 'GET', 'timeout' => 8))); + if ($lang_packs = Tools::file_get_contents($file_name, false, $array_stream_context)) // Notice : for php < 5.2 compatibility, Tools::jsonDecode. The second parameter to true will set us if ($lang_packs != '' && $lang_packs = Tools::jsonDecode($lang_packs, true)) foreach ($lang_packs as $key => $lang_pack) @@ -768,7 +768,8 @@ class AdminTranslationsControllerCore extends AdminController $arr_import_lang = explode('|', Tools::getValue('params_import_language')); /* 0 = Language ISO code, 1 = PS version */ if (Validate::isLangIsoCode($arr_import_lang[0])) { - $content = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/gzip/'.$arr_import_lang[1].'/'.Tools::strtolower($arr_import_lang[0]).'.gzip'); + $array_stream_context = @stream_context_create(array('http' => array('method' => 'GET', 'timeout' => 10))); + $content = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/gzip/'.$arr_import_lang[1].'/'.Tools::strtolower($arr_import_lang[0]).'.gzip', false, $array_stream_context); if ($content) { $file = _PS_TRANSLATIONS_DIR_.$arr_import_lang[0].'.gzip';