From a895d97dae6230b22c935ee7001e406056d3e4f2 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 3 Jul 2018 09:00:26 +0800 Subject: [PATCH 1/3] * Change ojbect to object. --- framework/base/control.class.php | 10 +++++----- framework/base/model.class.php | 12 ++++++------ framework/base/router.class.php | 12 ++++++------ framework/router.class.php | 2 +- lib/base/dao/dao.class.php | 2 +- lib/base/filter/filter.class.php | 2 +- module/git/model.php | 2 +- module/svn/model.php | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/framework/base/control.class.php b/framework/base/control.class.php index 23dde557c2..e1d1bd2519 100644 --- a/framework/base/control.class.php +++ b/framework/base/control.class.php @@ -71,7 +71,7 @@ class baseControl * $post对象，用户可以通过$this->post->key来引用$_POST变量。 * The $post object, useer can access a post var by $this->post->key. * - * @var ojbect + * @var object * @access public */ public $post; @@ -80,7 +80,7 @@ class baseControl * $get对象，用户可以通过$this->get->key来引用$_GET变量。 * The $get object, useer can access a get var by $this->get->key. * - * @var ojbect + * @var object * @access public */ public $get; @@ -89,7 +89,7 @@ class baseControl * $session对象，用户可以通过$this->session->key来引用$_SESSION变量。 * The $session object, useer can access a session var by $this->session->key. * - * @var ojbect + * @var object * @access public */ public $session; @@ -98,7 +98,7 @@ class baseControl * $server对象，用户可以通过$this->server->key来引用$_SERVER变量。 * The $server object, useer can access a server var by $this->server->key. * - * @var ojbect + * @var object * @access public */ public $server; @@ -107,7 +107,7 @@ class baseControl * $cookie对象，用户可以通过$this->cookie->key来引用$_COOKIE变量。 * The $cookie object, useer can access a cookie var by $this->cookie->key. * - * @var ojbect + * @var object * @access public */ public $cookie; diff --git a/framework/base/model.class.php b/framework/base/model.class.php index 0b84a41ee2..3d5c907aa0 100644 --- a/framework/base/model.class.php +++ b/framework/base/model.class.php @@ -72,7 +72,7 @@ class baseModel * $post对象，用于访问$_POST变量。 * The $post object, used to access the $_POST var. * - * @var ojbect + * @var object * @access public */ public $post; @@ -81,7 +81,7 @@ class baseModel * $get对象，用于访问$_GET变量。 * The $get object, used to access the $_GET var. * - * @var ojbect + * @var object * @access public */ public $get; @@ -90,7 +90,7 @@ class baseModel * $session对象，用于访问$_SESSION变量。 * The $session object, used to access the $_SESSION var. * - * @var ojbect + * @var object * @access public */ public $session; @@ -99,7 +99,7 @@ class baseModel * $server对象，用于访问$_SERVER变量。 * The $server object, used to access the $_SERVER var. * - * @var ojbect + * @var object * @access public */ public $server; @@ -108,7 +108,7 @@ class baseModel * $cookie对象，用于访问$_COOKIE变量。 * The $cookie object, used to access the $_COOKIE var. * - * @var ojbect + * @var object * @access public */ public $cookie; @@ -117,7 +117,7 @@ class baseModel * $global对象，用于访问$_GLOBAL变量。 * The $global object, used to access the $_GLOBAL var. * - * @var ojbect + * @var object * @access public */ public $global; diff --git a/framework/base/router.class.php b/framework/base/router.class.php index fddd0fc42b..1161aadb9c 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -270,7 +270,7 @@ class baseRouter * $post对象，用于访问$_POST变量。 * The $post object, used to access the $_POST var. * - * @var ojbect + * @var object * @access public */ public $post; @@ -279,7 +279,7 @@ class baseRouter * $get对象，用于访问$_GET变量。 * The $get object, used to access the $_GET var. * - * @var ojbect + * @var object * @access public */ public $get; @@ -288,7 +288,7 @@ class baseRouter * $session对象，用于访问$_SESSION变量。 * The $session object, used to access the $_SESSION var. * - * @var ojbect + * @var object * @access public */ public $session; @@ -297,7 +297,7 @@ class baseRouter * $server对象，用于访问$_SERVER变量。 * The $server object, used to access the $_SERVER var. * - * @var ojbect + * @var object * @access public */ public $server; @@ -306,7 +306,7 @@ class baseRouter * $cookie对象，用于访问$_COOKIE变量。 * The $cookie object, used to access the $_COOKIE var. * - * @var ojbect + * @var object * @access public */ public $cookie; @@ -2042,7 +2042,7 @@ class baseRouter * @param string $moduleName the module name * @param string $appName the app name * @access public - * @return bool|ojbect the lang object or false. + * @return bool|object the lang object or false. */ public function loadLang($moduleName, $appName = '') { diff --git a/framework/router.class.php b/framework/router.class.php index 536dddf8dd..87c03113c4 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -27,7 +27,7 @@ class router extends baseRouter * @param string $moduleName the module name * @param string $appName the app name * @access public - * @return bool|ojbect the lang object or false. + * @return bool|object the lang object or false. */ public function loadLang($moduleName, $appName = '') { diff --git a/lib/base/dao/dao.class.php b/lib/base/dao/dao.class.php index 61cc74b33d..2b3ab231b9 100644 --- a/lib/base/dao/dao.class.php +++ b/lib/base/dao/dao.class.php @@ -1618,7 +1618,7 @@ class baseSQL * * @param int $count * @access public - * @return ojbect the sql object. + * @return object the sql object. */ public function markLeft($count = 1) { diff --git a/lib/base/filter/filter.class.php b/lib/base/filter/filter.class.php index 20c692873f..c11a120e9f 100644 --- a/lib/base/filter/filter.class.php +++ b/lib/base/filter/filter.class.php @@ -804,7 +804,7 @@ class baseFixer * 处理的数据。 * The data to be fixed. * - * @var ojbect + * @var object * @access public */ public $data; diff --git a/module/git/model.php b/module/git/model.php index f92682592a..64e2cc3d7b 100644 --- a/module/git/model.php +++ b/module/git/model.php @@ -323,7 +323,7 @@ class gitModel extends model * * @param object $log * @access public - * @return ojbect + * @return object */ public function convertLog($log) { diff --git a/module/svn/model.php b/module/svn/model.php index 0aa57d1776..0541b526b6 100644 --- a/module/svn/model.php +++ b/module/svn/model.php @@ -311,7 +311,7 @@ class svnModel extends model * * @param object $log * @access public - * @return ojbect + * @return object */ public function convertLog($log) { From 0810c5eea01d97ed0f69cb197300d6d504abe8ea Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 3 Jul 2018 09:01:46 +0800 Subject: [PATCH 2/3] * Display doc libs by list. --- module/doc/model.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index 3ac158f868..623d948c81 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -871,12 +871,13 @@ class docModel extends model if($type == 'product' or $type == 'project') { - $table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT; - $libs = $this->dao->select('id,name,`order`')->from($table)->where('id')->in($idList)->orderBy('`order` desc, id desc')->page($pager, 'id')->fetchAll('id'); + $table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT; + $fields = $type == 'product' ? "createdBy, createdDate" : "openedBy AS createdBy, openedDate AS createdDate"; + $libs = $this->dao->select("id, name, `order`, {$fields}")->from($table)->where('id')->in($idList)->orderBy('`order` desc, id desc')->page($pager, 'id')->fetchAll('id'); } else { - $libs = $this->dao->select('id,name')->from(TABLE_DOCLIB)->where('id')->in($idList)->orderBy('`order`, id desc')->page($pager, 'id')->fetchAll('id'); + $libs = $this->dao->select('id, name, collector')->from(TABLE_DOCLIB)->where('id')->in($idList)->orderBy('`order`, id desc')->page($pager, 'id')->fetchAll('id'); } return $libs; From 5017751ead4338567d0889d4d51cd1ecbdf5337f Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 3 Jul 2018 09:21:17 +0800 Subject: [PATCH 3/3] * finish task #4518. --- www/js/kindeditor/plugins/flash/flash.js | 6 +++--- www/js/kindeditor/plugins/image/image.js | 6 +++--- www/js/kindeditor/plugins/insertfile/insertfile.js | 6 +++--- www/js/kindeditor/plugins/media/media.js | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/www/js/kindeditor/plugins/flash/flash.js b/www/js/kindeditor/plugins/flash/flash.js index d5d465e166..e51b0da4fd 100755 --- a/www/js/kindeditor/plugins/flash/flash.js +++ b/www/js/kindeditor/plugins/flash/flash.js @@ -24,9 +24,9 @@ KindEditor.plugin('flash', function(K) { '', '  ', '  ', - '', - '', - '', + //'', + //'', + //'', '', //width '
', diff --git a/www/js/kindeditor/plugins/image/image.js b/www/js/kindeditor/plugins/image/image.js index 88ab7eb6f4..0797026d67 100644 --- a/www/js/kindeditor/plugins/image/image.js +++ b/www/js/kindeditor/plugins/image/image.js @@ -46,9 +46,9 @@ KindEditor.plugin('image', function(K) { '
', '', '  ', - '', - '', - '', + //'', + //'', + //'', '
', //size '
', diff --git a/www/js/kindeditor/plugins/insertfile/insertfile.js b/www/js/kindeditor/plugins/insertfile/insertfile.js index b8c523e773..b204e918b5 100755 --- a/www/js/kindeditor/plugins/insertfile/insertfile.js +++ b/www/js/kindeditor/plugins/insertfile/insertfile.js @@ -26,9 +26,9 @@ KindEditor.plugin('insertfile', function(K) { '', '  ', '  ', - '', - '', - '', + //'', + //'', + //'', '
', //title '
', diff --git a/www/js/kindeditor/plugins/media/media.js b/www/js/kindeditor/plugins/media/media.js index 58034662a8..0c590be769 100755 --- a/www/js/kindeditor/plugins/media/media.js +++ b/www/js/kindeditor/plugins/media/media.js @@ -24,9 +24,9 @@ KindEditor.plugin('media', function(K) { '', '  ', '  ', - '', - '', - '', + //'', + //'', + //'', '
', //width '
',