From d3f8dac3d4154920846dbb5a5013a1f6ff00c8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Thu, 13 Sep 2018 11:25:21 +0800
Subject: [PATCH] * Fix bug.

---
 module/common/lang/en.php         | 1 +
 module/common/lang/menuOrder.php  | 1 +
 module/common/lang/zh-cn.php      | 1 +
 module/doc/model.php              | 2 +-
 module/entry/view/create.html.php | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 7ce0a905ad..b9f6edc4db 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -372,6 +372,7 @@ $lang->admin->menu->safe      = array('link' => 'Security|admin|safe', 'alias' =
 $lang->admin->menu->cron      = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
 $lang->admin->menu->trashes   = array('link' => 'Recycle|action|trash', 'subModule' => 'action');
 $lang->admin->menu->dev       = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
+$lang->admin->menu->entry     = 'Entry|entry|browse';
 $lang->admin->menu->sso       = 'Zdoo|admin|sso';
 
 $lang->convert   = new stdclass();
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index bb98f6e8ac..1490f25378 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -115,6 +115,7 @@ $lang->admin->menuOrder[45] = 'dev';
 $lang->admin->menuOrder[50] = 'safe';
 $lang->admin->menuOrder[53] = 'api';
 $lang->admin->menuOrder[55] = 'sso';
+$lang->admin->menuOrder[57] = 'entry';
 $lang->admin->menuOrder[60] = 'trashes';
 $lang->convert->menuOrder   = $lang->admin->menuOrder;
 $lang->upgrade->menuOrder   = $lang->admin->menuOrder;
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 63833b3223..edf79c3ac3 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -372,6 +372,7 @@ $lang->admin->menu->safe      = array('link' => '安全|admin|safe', 'alias' =>
 $lang->admin->menu->cron      = array('link' => '计划任务|cron|index', 'subModule' => 'cron');
 $lang->admin->menu->trashes   = array('link' => '回收站|action|trash', 'subModule' => 'action');
 $lang->admin->menu->dev       = array('link' => '二次开发|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
+$lang->admin->menu->entry     = '应用|entry|browse';
 $lang->admin->menu->sso       = '然之集成|admin|sso';
 
 $lang->convert   = new stdclass();
diff --git a/module/doc/model.php b/module/doc/model.php
index e2e57daf40..e852f9030a 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -517,7 +517,7 @@ class docModel extends model
         $stmt = $this->dao->select('*')->from(TABLE_DOC)
             ->where('deleted')->eq(0)
             ->beginIF($libID)->andWhere('lib')->in($libID)->fi()
-            ->andWhere('module')->in($module)
+            ->beginIF(!empty($module))->andWhere('module')->in($module)->fi()
             ->query();
 
 
diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php
index 520d422bb7..32babe1cba 100644
--- a/module/entry/view/create.html.php
+++ b/module/entry/view/create.html.php
@@ -55,7 +55,7 @@
         <tr>
           <th></th>
           <td>
-            <?php echo html::submitButton();?>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::a($config->entry->help, $lang->entry->help, '_blank', "class='help'");?>
           </td>
           <td></td>