diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/items.php | 4 | ||||
| -rw-r--r-- | js/fk.autocomplete.js | 21 | ||||
| -rw-r--r-- | library/HTML5/TreeBuilder.php | 4 |
4 files changed, 21 insertions, 10 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDIKA_PLATFORM', 'Friendica'); -define ( 'FRIENDIKA_VERSION', '2.3.1161' ); +define ( 'FRIENDIKA_VERSION', '2.3.1162' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1103 ); diff --git a/include/items.php b/include/items.php index 35db71946..b8e258d3f 100644 --- a/include/items.php +++ b/include/items.php @@ -2666,7 +2666,7 @@ function item_getfeedtags($item) { $matches = false; $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); if($cnt) { - for($x = 0; $x < count($matches); $x ++) { + for($x = 0; $x < $cnt; $x ++) { if($matches[1][$x]) $ret[] = array('#',$matches[1][$x], $matches[2][$x]); } @@ -2674,7 +2674,7 @@ function item_getfeedtags($item) { $matches = false; $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); if($cnt) { - for($x = 0; $x < count($matches); $x ++) { + for($x = 0; $x < $cnt; $x ++) { if($matches[1][$x]) $ret[] = array('@',$matches[1][$x], $matches[2][$x]); } diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index 3f73c6fbb..545fd1645 100644 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -23,6 +23,13 @@ function ACPopup(elm,backend_url){ style = $(elm.container).offset(); w = elm.container.offsetWidth; h = elm.container.offsetHeight; + // Quick fix for chrome until I get a tool to inspect the dom + // Chrome returns 0x0 + if(! w) + w = 530; + if(! h) + h = 130; + } style.top=style.top+h; @@ -105,9 +112,13 @@ ACPopup.prototype._search = function(){ $(this.cont).append(elm); } ACPopup.prototype.onkey = function(event){ - if (event.keyCode == '13' && this.idsel>-1) { - this.cont.children()[this.idsel].click(); - event.preventDefault(); + if (event.keyCode == '13') { + if(this.idsel>-1) { + this.cont.children()[this.idsel].click(); + event.preventDefault(); + } + else + this.close(); } if (event.keyCode == '38') { //cursor up cmax = this.cont.children().size()-1; @@ -115,14 +126,14 @@ ACPopup.prototype.onkey = function(event){ if (this.idsel<0) this.idsel=cmax; event.preventDefault(); } - if (event.keyCode == '40') { //cursor down + if (event.keyCode == '40' || event.keyCode == '9') { //cursor down cmax = this.cont.children().size()-1; this.idsel++; if (this.idsel>cmax) this.idsel=0; event.preventDefault(); } - if (event.keyCode == '38' || event.keyCode == '40' ) { + if (event.keyCode == '38' || event.keyCode == '40' || event.keyCode == '9') { this.cont.children().removeClass('selected'); $(this.cont.children()[this.idsel]).addClass('selected'); } diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php index a64816f56..c0074ec73 100644 --- a/library/HTML5/TreeBuilder.php +++ b/library/HTML5/TreeBuilder.php @@ -3041,9 +3041,9 @@ class HTML5_TreeBuilder { if (!empty($token['attr'])) { foreach($token['attr'] as $attr) { - // mike@macgirvin.com 2011-10-21, stray double quotes cause everything to abort + // mike@macgirvin.com 2011-10-21, stray double quotes and/or numeric tags cause everything to abort $attr['name'] = str_replace('"','',$attr['name']); - if(!$el->hasAttribute($attr['name'])) { + if(!$el->hasAttribute($attr['name']) && (! is_numeric($attr['name']))) { $el->setAttribute($attr['name'], $attr['value']); } } |