fix import and allow null value for original_title

devfake · Dec 15, 2016 · 93e527d · 93e527d
1 parent 6c2674c
commit 93e527d
Show file tree

Hide file tree

Showing 5 changed files with 442 additions and 4 deletions.
diff --git a/backend/app/Http/Controllers/SettingController.php b/backend/app/Http/Controllers/SettingController.php
@@ -53,6 +53,8 @@ public function export()
      */
     public function import(ImportRequest $request)
     {
+      set_time_limit(300);
+
       $file = $request->file('import');
       $extension = $file->getClientOriginalExtension();
 

diff --git a/backend/composer.json b/backend/composer.json
@@ -9,7 +9,8 @@
         "laravel/framework": "5.3.*",
         "laravel/scout": "^1.1",
         "guzzlehttp/guzzle": "^6.2",
-        "algolia/algoliasearch-client-php": "^1.10"
+        "algolia/algoliasearch-client-php": "^1.10",
+        "doctrine/dbal": "^2.5"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",