ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tag merging: fixed validation

Browse source
This commit is contained in:
Marcin Kurczewski 2013-11-01 09:42:13 +01:00
parent bd05123cfc
commit fe99f97287
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Controllers/TagController.php
View file

@ -29,8 +29,16 @@ class TagController
PrivilegesHelper::confirmWithException(Privilege::MergeTags); PrivilegesHelper::confirmWithException(Privilege::MergeTags);
if (InputHelper::get('submit')) if (InputHelper::get('submit'))
{ {
$sourceTag = Model_Tag::locate(InputHelper::get('source-tag')); $suppliedSourceTag = InputHelper::get('source-tag');
$targetTag = Model_Tag::locate(InputHelper::get('target-tag')); $suppliedSourceTag = Model_Tag::validateTag($suppliedSourceTag);
$sourceTag = Model_Tag::locate($suppliedSourceTag);
$suppliedTargetTag = InputHelper::get('target-tag');
$suppliedTargetTag = Model_Tag::validateTag($suppliedTargetTag);
$targetTag = Model_Tag::locate($suppliedTargetTag);
if ($sourceTag->id == $targetTag->id)
throw new SimpleException('Source and target tag are the same');
R::preload($sourceTag, 'post'); R::preload($sourceTag, 'post');