fixes

kleeja-official · Jun 7, 2019 · c3091b8 · c3091b8
1 parent 598452c
commit c3091b8
Showing 1 changed file with 21 additions and 7 deletions.
diff --git a/includes/functions.php b/includes/functions.php
@@ -951,29 +951,43 @@ function delete_olang($words = '', $lang = 'en', $plg_id = 0)
 
     if (is_array($words))
     {
-        foreach ((array) $lang as $language)
+        foreach ($words as $w)
         {
-            foreach ($words as $w)
-            {
-                delete_olang($w, $language, $plg_id);
-            }
+            delete_olang($w, $lang, $plg_id);
         }
 
         return true;
     }
 
     $delete_query    = [
         'DELETE'       => "{$dbprefix}lang",
-        'WHERE'        => "word = '" . $SQL->escape($words) . "' AND lang_id = '" . $SQL->escape($lang) . "'"
+        'WHERE'        => empty($words) ? '' : "word = '" . $SQL->escape($words) . "'"
     ];
 
+
+    if (! empty($lang))
+    {
+        $lang_sql = "lang_id = '" . $SQL->escape($lang) . "'";
+        if(is_array($lang))
+        {
+            $lang_sql = "(lang_id = '" . implode("' AND lang_id = '", $SQL->escape($lang)) . "')";
+        }
+
+        $delete_query['WHERE'] .=  (empty($delete_query['WHERE']) ? '' : ' AND ') . $lang_sql;
+    }
+
     if (! empty($plg_id))
     {
-        $delete_query['WHERE'] = 'plg_id = ' . intval($plg_id);
+        $delete_query['WHERE'] .= (empty($delete_query['WHERE']) ? '' : ' AND ') . 'plg_id = ' . intval($plg_id);
     }
 
     is_array($plugin_run_result = Plugins::getInstance()->run('del_sql_delete_olang_func', get_defined_vars())) ? extract($plugin_run_result) : null; //run hook
 
+    if(empty($delete_query['WHERE']))
+    {
+        return false;
+    }
+
     $SQL->build($delete_query);
 
     return $SQL->affected();