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

Mass tag: fixed tag case sensitiveness bug

Browse source
This commit is contained in:
Marcin Kurczewski 2013-11-21 21:06:18 +01:00
parent 601bdab8e1
commit 6549237dda
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Controllers/PostController.php
View file

@ -122,7 +122,10 @@ class PostController
$post = Model_Post::locate($id); $post = Model_Post::locate($id);
R::preload($post, ['uploader' => 'user']); R::preload($post, ['uploader' => 'user']);
$this->context->transport->post = $post; $this->context->transport->post = $post;
$tag = Model_Tag::validateTag($tag);
$tagRow = Model_Tag::locate($tag, false);
if ($tagRow !== null)
$tag = $tagRow->name;
if (InputHelper::get('submit')) if (InputHelper::get('submit'))
{ {
@ -886,7 +889,8 @@ class PostController
$ext = '.dat'; $ext = '.dat';
$fn = sprintf('%s_%s_%s.%s', $fn = sprintf('%s_%s_%s.%s',
$this->config->main->title, $this->config->main->title,
$post->id, join(',', array_map(function($tag) { return $tag->name; }, $post->sharedTag)), $post->id,
join(',', array_map(function($tag) { return $tag->name; }, $post->sharedTag)),
$ext); $ext);
$fn = preg_replace('/[[:^print:]]/', '', $fn); $fn = preg_replace('/[[:^print:]]/', '', $fn);

9
src/Models/Model_Post.php
View file

@ -56,4 +56,13 @@ class Model_Post extends AbstractModel
{ {
return 'Model_Post_QueryBuilder'; return 'Model_Post_QueryBuilder';
} }
public function isTaggedWith($tagName)
{
$tagName = trim(strtolower($tagName));
foreach ($this->sharedTag as $tag)
if (trim(strtolower($tag->name)) == $tagName)
return true;
return false;
}
} }

2
src/Views/post-small.phtml
View file

@ -2,7 +2,7 @@
<?php $masstag = (isset($this->context->source) and $this->context->source == 'mass-tag' and !empty($this->context->additionalInfo)) ?> <?php $masstag = (isset($this->context->source) and $this->context->source == 'mass-tag' and !empty($this->context->additionalInfo)) ?>
<?php if ($masstag): ?> <?php if ($masstag): ?>
<?php $classNames []= 'taggable' ?> <?php $classNames []= 'taggable' ?>
<?php if (in_array($this->context->additionalInfo, array_map(function($x) { return $x->name; }, $this->context->post->sharedTag))): ?> <?php if ($this->context->post->isTaggedWith($this->context->additionalInfo)): ?>
<?php $classNames []= 'tagged' ?> <?php $classNames []= 'tagged' ?>
<?php endif ?> <?php endif ?>
<?php endif ?> <?php endif ?>