projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d86b84d
c52eca9
)
Merge branch 'master' into next
author
Matthias Schmidt
<gravatronics@live.com>
Thu, 24 May 2018 15:57:26 +0000
(17:57 +0200)
committer
Matthias Schmidt
<gravatronics@live.com>
Thu, 24 May 2018 15:57:26 +0000
(17:57 +0200)
19 files changed:
1
2
wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/acp/form/LoginForm.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/data/user/UserProfile.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/WCF.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/ad/AdHandler.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeTextParser.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeA.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/message/embedded/object/MessageEmbeddedObjectManager.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/session/SessionHandler.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/util/HeaderUtil.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/util/MessageUtil.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/acp/form/LoginForm.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/data/user/UserProfile.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/WCF.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/ad/AdHandler.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeTextParser.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeA.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/message/embedded/object/MessageEmbeddedObjectManager.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/session/SessionHandler.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/util/HeaderUtil.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/util/MessageUtil.class.php
index f6192b12176229ab87e3a7556399ad4024dd173c,589c06699399d7d386cce2c587c8f6fa80501fe9..4c2e22bb946c25a77316cb82a59222077f9899e7
---
1
/
wcfsetup/install/files/lib/util/MessageUtil.class.php
---
2
/
wcfsetup/install/files/lib/util/MessageUtil.class.php
+++ b/
wcfsetup/install/files/lib/util/MessageUtil.class.php
@@@
-1,6
-1,6
+1,7
@@@
<?php
+declare(strict_types=1);
namespace wcf\util;
+ use wcf\system\application\ApplicationHandler;
use wcf\system\html\input\HtmlInputProcessor;
use wcf\system\Regex;