harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pocorate

Browse Source
This commit is contained in:
friendica 2015-01-29 15:21:19 -08:00
commit df6d54c64e
5 changed files with 5 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

1
mod/connedit.php
View File

@ -564,6 +564,7 @@ function connedit_content(&$a) {
} }
$poco_rating = get_config('system','poco_rating_enable'); $poco_rating = get_config('system','poco_rating_enable');
$poco_rating = 0; // leave disabled until we're ready for it.
// if unset default to enabled // if unset default to enabled
if($poco_rating === false) if($poco_rating === false)
$poco_rating = true; $poco_rating = true;

6
mod/tagger.php
View File

@ -12,11 +12,9 @@ function tagger_content(&$a) {
} }
$observer_hash = get_observer_hash(); $observer_hash = get_observer_hash();
//strip html-tags
$term = notags(trim($_GET['term'])); $term = notags(trim($_GET['term']));
// no commas allowed //check if empty
$term = str_replace(array(',',' '),array('','_'),$term);
if(! $term) if(! $term)
return; 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). // 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id).
if(id.length > 16) if(id.length > 16)
id = item.id.substring(0,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) { function basic_replace(item) {

2
view/tpl/event_form.tpl
View File

@ -41,7 +41,7 @@
{{if $catsenabled}} {{if $catsenabled}}
<div id="event-category-wrap"> <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> </div>
{{/if}} {{/if}}