Fix #257 , Fix #247

src/Hyyan/WPI/Pages.php

@@ -161,16 +161,23 @@ public function translateShopUrl($url, $language) {
      * @return string modified form
      */
     public function addShortcodeLanguageFilter($query_args, $atts) {
-
-        $ids = explode(',', $atts['ids']);
-        $transIds = array();
-        foreach ($ids as $id) {
-            array_push($transIds, pll_get_post($id));
-        }
 
-        $atts['ids'] = $transIds;
-        $query_args['post__in'] = $transIds;
 
+        if (strlen($atts['ids'])) {
+
+            $ids = explode(',', $atts['ids']);
+            $transIds = array();
+            foreach ($ids as $id) {
+                array_push($transIds, pll_get_post($id));
+            }
+
+            $atts['ids'] = implode($transIds, ',');
+            $query_args['post__in'] = $transIds;
+        } else {
+            $query_args['lang'] = isset($query_args['lang']) ?
+                    $query_args['lang'] : pll_current_language();
+        }
+
         return $query_args;
     }