projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
84731a7
b9687d2
)
Merge branch 'next' into formBuilder
author
Matthias Schmidt
<gravatronics@live.com>
Fri, 27 Jul 2018 13:35:20 +0000
(15:35 +0200)
committer
Matthias Schmidt
<gravatronics@live.com>
Fri, 27 Jul 2018 13:35:20 +0000
(15:35 +0200)
1
2
wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/language/I18nHandler.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/util/ClassUtil.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/language/I18nHandler.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/util/ClassUtil.class.php
index 5440212b40cf4069566a5c15efcbdb5b2f487fee,550af86e26712fc9c7d6849ec30d893069f377af..7df38c9e6e87f67a32f730c76e87768c140ca38b
---
1
/
wcfsetup/install/files/lib/util/ClassUtil.class.php
---
2
/
wcfsetup/install/files/lib/util/ClassUtil.class.php
+++ b/
wcfsetup/install/files/lib/util/ClassUtil.class.php
@@@
-1,7
-1,5
+1,6
@@@
<?php
- declare(strict_types=1);
namespace wcf\util;
+use wcf\data\DatabaseObjectDecorator;
use wcf\system\exception\SystemException;
/**