Skip to content

Commit

Permalink
v1.6.17: Bugfix: Newsfeed Import doesn't load new links if WordPress …
Browse files Browse the repository at this point in the history
…is used for multiple users
  • Loading branch information
andreask7 committed May 9, 2015
1 parent e2c4a0a commit 31b6f2b
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 23 deletions.
3 changes: 2 additions & 1 deletion ajax_load_feed.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@
For more information, please refer to [http://unlicense.org/].
***************************************************************/


require_once( 'settings.inc.php' );
require_once( 'connect.inc.php' );
require_once( 'dbutils.inc.php' );
require_once( 'utilities.inc.php' );

session_write_close();
$imported_feed=0;
$nif=0;
$msg='';
Expand Down
7 changes: 6 additions & 1 deletion info.htm
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ <h4>

<dd>
<ul>
<li>The current version is <b>1.6.16 (May 01 2015)</b>.
<li>The current version is <b>1.6.17 (May 09 2015)</b>.
</li>

<li>
Expand Down Expand Up @@ -2717,6 +2717,11 @@ <h4>

<dd>
<ul>
<li>1.6.17 (May 09 2015):<br />
Bugfix: Newsfeed Import doesn't load new links if WordPress is used for multiple users.<br />
<br />
</li>

<li>1.6.16 (May 01 2015):<br />
Improved Sentence Bondary Detection when parsing texts.<br />
User ID is saved in the PHP Session Variable (instead of a Cookie) if wordpress is used to log in.<br />
Expand Down
10 changes: 5 additions & 5 deletions js/jq_pgm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 16 additions & 15 deletions src/js/jq_pgm.js
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ function mword_drag_n_drop_select() {
});

to=setTimeout(function(){
var pos;
context.off('mouseout');
$('.wsty',context).not('.hide,.word').each(function(){
f=parseInt($(this).attr('data_code'))*2 + parseInt($(this).attr('data_order')) - 1;
Expand Down Expand Up @@ -446,7 +447,7 @@ function mword_drag_n_drop_select() {
$('span',context).removeClass('nword tword lword');
}
});
var pos=parseInt($(this).attr('data_order'));
pos=parseInt($(this).attr('data_order'));
$('.lword',context).removeClass('lword');
$(this).addClass('lword');
$(context).on('mouseleave',function(){
Expand Down Expand Up @@ -474,22 +475,22 @@ function mword_drag_n_drop_select() {
$(context).off();
}
});
$(context).hoverIntent({over:function(){
$('.lword',context).removeClass('lword');
var lpos=parseInt($(this).attr('data_order'));
$(this).addClass('lword');
if(lpos>pos){
for(var i=pos;i<lpos;i++){
$('.tword[data_order="' + i + '"],.nword[data_order="' + i + '"]',context).addClass('lword');
}
});
$(context).hoverIntent({over:function(){
$('.lword',context).removeClass('lword');
var lpos=parseInt($(this).attr('data_order'));
$(this).addClass('lword');
if(lpos>pos){
for(var i=pos;i<lpos;i++){
$('.tword[data_order="' + i + '"],.nword[data_order="' + i + '"]',context).addClass('lword');
}
else{
for(var i=pos;i>lpos;i--){
$('.tword[data_order="' + i + '"],.nword[data_order="' + i + '"]',context).addClass('lword');
}
}
else{
for(var i=pos;i>lpos;i--){
$('.tword[data_order="' + i + '"],.nword[data_order="' + i + '"]',context).addClass('lword');
}
},out:function(){}, sensitivity: 18, selector:".tword"});
});
}
},out:function(){}, sensitivity: 18, selector:".tword"});
}, 300);
}

Expand Down
2 changes: 1 addition & 1 deletion utilities.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ function get_text_from_rsslink($feed_data,$NfArticleSection,$NfFilterTags,$NfCha

function get_version() {
global $debug;
return '1.6.16 (May 01 2015)' .
return '1.6.17 (May 09 2015)' .
($debug ? ' <span class="red">DEBUG</span>' : '');
}

Expand Down

0 comments on commit 31b6f2b

Please sign in to comment.