Merge remote-tracking branch 'origin/develop'

galli-leo · galli-leo · commit 2350e1c64809 · 2018-02-03T23:13:01.000+01:00
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
@@ -23,14 +23,14 @@ public static function get_from_imdb_py($path, $selection, $rememberMinutes = 60
 
           $fullIds = array();
 
-          if (count($fullIds) == 0)
+          foreach ($ids as $id)
           {
-              return [];
+              $fullIds[] = rtrim(str_ireplace("/title/", "", $id), "/");
           }
 
-          foreach ($ids as $id)
+          if (count($fullIds) == 0)
           {
-              $fullIds[] = rtrim(str_ireplace("/title/", "", $id), "/");
+              return [];
           }
 
           $idStr = join("','", $fullIds);

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@ public static function get_from_imdb_py($path, $selection, $rememberMinutes = 60`
`23`	`23`
`24`	`24`	`$fullIds = array();`
`25`	`25`
`26`		`- if (count($fullIds) == 0)`
	`26`	`+ foreach ($ids as $id)`
`27`	`27`	`{`
`28`		`- return [];`
	`28`	`+ $fullIds[] = rtrim(str_ireplace("/title/", "", $id), "/");`
`29`	`29`	`}`
`30`	`30`
`31`		`- foreach ($ids as $id)`
	`31`	`+ if (count($fullIds) == 0)`
`32`	`32`	`{`
`33`		`- $fullIds[] = rtrim(str_ireplace("/title/", "", $id), "/");`
	`33`	`+ return [];`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`$idStr = join("','", $fullIds);`