Skip to content

Commit

Permalink
Merge branch '3.2-release' into 3.3-release
Browse files Browse the repository at this point in the history
  • Loading branch information
emodric committed Feb 22, 2018
2 parents 0203747 + 3740511 commit 1648291
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions bundle/Resources/translations/forms.en.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'Tags': 'Netgen Tags'
'Tags / All functions': 'Netgen Tags / All functions'
'Tags / Read': 'Netgen Tags / Read tags'
'Tags / View': 'Netgen Tags / Use "/tags/view" page'
'Tags / Add': 'Netgen Tags / Add tags'
'Tags / Addsynonym': 'Netgen Tags / Add synonyms'
'Tags / Edit': 'Netgen Tags / Edit tags'
'Tags / Editsynonym': 'Netgen Tags / Edit synonyms'
'Tags / Delete': 'Netgen Tags / Delete tags'
'Tags / Deletesynonym': 'Netgen Tags / Delete synonyms'
'Tags / Makesynonym': 'Netgen Tags / Convert tag to synonym'
'Tags / Merge': 'Netgen Tags / Merge tags'
2 changes: 1 addition & 1 deletion bundle/View/Builder/TagViewBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function __construct(
*/
public function matches($argument)
{
return strpos($argument, 'eztags.controller.tag_view:') !== false;
return is_string($argument) && strpos($argument, 'eztags.controller.tag_view:') !== false;
}

/**
Expand Down

0 comments on commit 1648291

Please sign in to comment.