Skip to content

Commit 82415aa

Browse files
authored
Merge pull request #6260 from WoltLab/6.2-obsolete-slash
Remove obsolete slash
2 parents cb16864 + 2458838 commit 82415aa

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

wcfsetup/install/files/lib/data/reaction/type/ReactionTypeAction.class.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public function create()
8787
if (!$iconFile->isProcessed()) {
8888
$fileName = $reactionType->reactionTypeID . '-' . $iconFile->getFilename();
8989

90-
\rename($iconFile->getLocation(), WCF_DIR . '/images/reaction/' . $fileName);
91-
$iconFile->setProcessed(WCF_DIR . '/images/reaction/' . $fileName);
90+
\rename($iconFile->getLocation(), WCF_DIR . 'images/reaction/' . $fileName);
91+
$iconFile->setProcessed(WCF_DIR . 'images/reaction/' . $fileName);
9292

9393
$updateData['iconFile'] = $fileName;
9494
}
@@ -142,8 +142,8 @@ public function update()
142142
if (!$iconFile->isProcessed()) {
143143
$fileName = $object->reactionTypeID . '-' . $iconFile->getFilename();
144144

145-
\rename($iconFile->getLocation(), WCF_DIR . '/images/reaction/' . $fileName);
146-
$iconFile->setProcessed(WCF_DIR . '/images/reaction/' . $fileName);
145+
\rename($iconFile->getLocation(), WCF_DIR . 'images/reaction/' . $fileName);
146+
$iconFile->setProcessed(WCF_DIR . 'images/reaction/' . $fileName);
147147

148148
$updateData['iconFile'] = $fileName;
149149
}
@@ -193,8 +193,8 @@ public function delete()
193193
]);
194194

195195
// Delete outdated reaction type icon.
196-
if (isset($object->iconFile) && \file_exists(WCF_DIR . '/images/reaction/' . $object->iconFile)) {
197-
@\unlink(WCF_DIR . '/images/reaction/' . $object->iconFile);
196+
if (isset($object->iconFile) && \file_exists(WCF_DIR . 'images/reaction/' . $object->iconFile)) {
197+
@\unlink(WCF_DIR . 'images/reaction/' . $object->iconFile);
198198
}
199199
}
200200

wcfsetup/install/files/lib/system/WCF.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class WCF
180180
*/
181181
protected static $zendOpcacheEnabled;
182182

183-
public const BOOTSTRAP_LOADER = \WCF_DIR . '/lib/bootstrap.php';
183+
public const BOOTSTRAP_LOADER = \WCF_DIR . 'lib/bootstrap.php';
184184

185185
/**
186186
* Calls all init functions of the WCF class.

wcfsetup/install/files/lib/system/bbcode/BBCodeHandler.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public function getHighlighterMeta()
164164
$this->highlighterMeta = JSON::decode(\preg_replace(
165165
'/.*\/\*!START\*\/\s*const\s*metadata\s*=\s*(.*)\s*;\s*\/\*!END\*\/.*/s',
166166
'\\1',
167-
\file_get_contents(WCF_DIR . '/js/WoltLabSuite/Core/prism-meta.js')
167+
\file_get_contents(WCF_DIR . 'js/WoltLabSuite/Core/prism-meta.js')
168168
));
169169
}
170170

0 commit comments

Comments
 (0)