diff options
| author | friendica <info@friendica.com> | 2015-01-29 15:21:19 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 15:21:19 -0800 |
| commit | df6d54c64ea73bffd0943dfd3d94e8157ec92a75 (patch) | |
| tree | e0ae971158a2696e20e075b485bc3836d504009f | |
| parent | fd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (diff) | |
| parent | d7dae3c72a5d22cd29d4ba8cfd18e7139ede09ff (diff) | |
| download | volse-hubzilla-df6d54c64ea73bffd0943dfd3d94e8157ec92a75.tar.gz volse-hubzilla-df6d54c64ea73bffd0943dfd3d94e8157ec92a75.tar.bz2 volse-hubzilla-df6d54c64ea73bffd0943dfd3d94e8157ec92a75.zip | |
Merge branch 'master' into pocorate
| -rw-r--r-- | doc/sv/roles.md (renamed from doc/sv/roles.bb) | 0 | ||||
| -rw-r--r-- | mod/connedit.php | 1 | ||||
| -rw-r--r-- | mod/tagger.php | 6 | ||||
| -rw-r--r-- | view/js/autocomplete.js | 2 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/doc/sv/roles.bb b/doc/sv/roles.md index 47147c6bf..47147c6bf 100644 --- a/doc/sv/roles.bb +++ b/doc/sv/roles.md diff --git a/mod/connedit.php b/mod/connedit.php index 3f610154c..1a00e854c 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -564,6 +564,7 @@ function connedit_content(&$a) { } $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($poco_rating === false) $poco_rating = true; diff --git a/mod/tagger.php b/mod/tagger.php index a93609c3c..aafad58cf 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -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; diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 86847cb35..b93cc16b3 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -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) { diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index a4717415e..2479068f3 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -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}} |