From 11ad8f1d957bedfe151518ccbfcddfa32495b2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 4 Dec 2017 13:32:17 +0800
Subject: [PATCH] * Fix bug 1315

---
 module/custom/model.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index 53eb15e080..8a48482aaa 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -21,11 +21,18 @@ class customModel extends model
     {
         $allCustomLang = $this->dao->select('*')->from(TABLE_LANG)->orderBy('lang,id')->fetchAll('id');
 
-        $currentLang   = $this->app->getClientLang();
+        $currentLang = $this->app->getClientLang();
+        $sectionLang = array();
+        foreach($allCustomLang as $customLang)
+        {
+            $sectionLang[$customLang->module][$customLang->section][$customLang->lang] = $customLang->lang;
+        }
+
         $processedLang = array();
         foreach($allCustomLang as $id => $customLang)
         {
             if($customLang->lang != $currentLang and $customLang->lang != 'all') continue;
+            if(isset($sectionLang[$customLang->module][$customLang->section]['all']) && isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) && $customLang->lang == 'all') continue;
             $processedLang[$customLang->module][$customLang->section][$customLang->key] = $customLang->value;
         }