Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 13:15:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/friendica/red into pending_merge

Browse source
This commit is contained in:
friendica 2015-01-29 15:19:16 -08:00
commit d7dae3c72a
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
doc/sv/roles.bb → doc/sv/roles.md
View file

6
mod/tagger.php
View file

@ -12,11 +12,9 @@ function tagger_content(&$a) {
}
$observer_hash = get_observer_hash();
//strip html-tags
$term = notags(trim($_GET['term']));
// no commas allowed
$term = str_replace(array(',',' '),array('','_'),$term);
//check if empty
if(! $term)
return;

2
view/js/autocomplete.js
View file

@ -77,7 +77,7 @@ function editor_replace(item) {
// 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id).
if(id.length > 16)
id = item.id.substring(0,16);
return '$1$2'+item.nick.replace(' ','') + '+' + id;
return '$1$2'+item.nick.replace(' ','') + '+' + id + ' ';
}
function basic_replace(item) {

2
view/tpl/event_form.tpl
View file

@ -41,7 +41,7 @@
{{if $catsenabled}}
<div id="event-category-wrap">
<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" />
<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" data-role="tagsinput" />
</div>
{{/if}}