api(aaplyEffects): always collage-layout specific frame & background

Change-Id: I3d659b77ebcc0526460605a29d31445cde5d7749

Author: andi34

api/applyEffects.php

@@ -39,25 +39,24 @@
 
     if (isset($_POST['collageLayout'])) {
         $config['collage']['layout'] = $_POST['collageLayout'];
-        if ($config['collage']['allow_selection']) {
-            if ($config['collage']['take_frame'] !== 'off') {
-                $collageFrame = $config['collage']['frame'];
-                $collageFrameDirectory = dirname($collageFrame);
-                $collageFrameFilename = basename($collageFrame);
-                $collageLayoutFrame = $collageFrameDirectory . '/' . $config['collage']['layout'] . '_' . $collageFrameFilename;
-                if (file_exists($collageLayoutFrame)) {
-                    $config['collage']['frame'] = $collageLayoutFrame;
-                }
-            }
-            if (!empty($config['collage']['background']) && $config['collage']['background'] !== '') {
-                $collageBackground = $config['collage']['background'];
-                $collageBackgroundDirectory = dirname($collageBackground);
-                $collageBackgroundFilename = basename($collageBackground);
-                $collageLayoutBackground = $collageBackgroundDirectory . '/' . $config['collage']['layout'] . '_' . $collageBackgroundFilename;
-                if (file_exists($collageLayoutBackground)) {
-                    $config['collage']['background'] = $collageLayoutBackground;
-                }
-            }
+
+    }
+    if ($config['collage']['take_frame'] !== 'off') {
+        $collageFrame = $config['collage']['frame'];
+        $collageFrameDirectory = dirname($collageFrame);
+        $collageFrameFilename = basename($collageFrame);
+        $collageLayoutFrame = $collageFrameDirectory . '/' . $config['collage']['layout'] . '_' . $collageFrameFilename;
+        if (file_exists($collageLayoutFrame)) {
+            $config['collage']['frame'] = $collageLayoutFrame;
+        }
+    }
+    if (!empty($config['collage']['background']) && $config['collage']['background'] !== '') {
+        $collageBackground = $config['collage']['background'];
+        $collageBackgroundDirectory = dirname($collageBackground);
+        $collageBackgroundFilename = basename($collageBackground);
+        $collageLayoutBackground = $collageBackgroundDirectory . '/' . $config['collage']['layout'] . '_' . $collageBackgroundFilename;
+        if (file_exists($collageLayoutBackground)) {
+            $config['collage']['background'] = $collageLayoutBackground;
         }
     }