gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 04:31:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2020-12-15 20:21:24 +01:00
commit 1d72fea524
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/inc.ClassControllerCommon.php
View File

@ -193,8 +193,12 @@ class SeedDMS_Controller_Common {
$tmps = array(); $tmps = array();
$tmp = explode('_', get_class($this)); $tmp = explode('_', get_class($this));
$tmps[] = $tmp[2]; $tmps[] = $tmp[2];
$tmp = explode('_', get_parent_class($this)); foreach(class_parents($this) as $pc) {
$tmp = explode('_', $pc);
$tmps[] = $tmp[2]; $tmps[] = $tmp[2];
}
// $tmp = explode('_', get_parent_class($this));
// $tmps[] = $tmp[2];
/* Run array_unique() in case the parent class has the same suffix */ /* Run array_unique() in case the parent class has the same suffix */
$tmps = array_unique($tmps); $tmps = array_unique($tmps);
foreach($tmps as $tmp) foreach($tmps as $tmp)

4
inc/inc.ClassViewCommon.php
View File

@ -112,8 +112,10 @@ class SeedDMS_View_Common {
$tmps = array(); $tmps = array();
$tmp = explode('_', get_class($this)); $tmp = explode('_', get_class($this));
$tmps[] = $tmp[2]; $tmps[] = $tmp[2];
$tmp = explode('_', get_parent_class($this)); foreach(class_parents($this) as $pc) {
$tmp = explode('_', $pc);
$tmps[] = $tmp[2]; $tmps[] = $tmp[2];
}
/* Run array_unique() in case the parent class has the same suffix */ /* Run array_unique() in case the parent class has the same suffix */
$tmps = array_unique($tmps); $tmps = array_unique($tmps);
$ret = null; $ret = null;