Merge branch 'sprint/206_liumengyi_fixbug' into 'master'
Sprint/206 liumengyi fixbug See merge request easycorp/zentaopms!4093
This commit is contained in:
@@ -2792,7 +2792,7 @@ EOT;
|
||||
{
|
||||
$libs = $this->getLibsByObject('custom', 0, '', $appendLib);
|
||||
$this->app->rawMethod = 'custom';
|
||||
if($libID == 0) $libID = key($libs);
|
||||
if($libID == 0 and !empty($libs)) $libID = reset($libs)->id;
|
||||
$this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID);
|
||||
|
||||
$object = new stdclass();
|
||||
@@ -2814,7 +2814,7 @@ EOT;
|
||||
$table = $this->config->objectTables[$type];
|
||||
$libs = $this->getLibsByObject($type, $objectID, '', $appendLib);
|
||||
|
||||
if($libID == 0) $libID = reset($libs)->id;
|
||||
if($libID == 0 and !empty($libs)) $libID = reset($libs)->id;
|
||||
$this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID);
|
||||
|
||||
if($this->app->tab == 'doc') $this->app->rawMethod = $type;
|
||||
|
||||
Reference in New Issue
Block a user