trebmuh: luciash, ping
I've svn checkout the branches/19.x
and I see a difference between the line in trunk and the line in 19.x
in trunk, it is : $item->setLink($URLPrefix.$data['sefurl']);
in 19.x it is : $item->setLink($URLPrefix . $data['sefurl']);
what should I commit here ?
1) $item->setLink($URLPrefix.urlencode($data['sefurl']));
2) $item->setLink($URLPrefix . urlencode($data['sefurl']));
?
oh no, I'm wrong
it is the same in trunk and in 19.x
that's on my install (12.10) which there is no space character
still, I'm unsure what to commit
1) $item->setLink($URLPrefix.urlencode($data['sefurl']));
or
2) $item->setLink($URLPrefix . urlencode($data['sefurl']));
?
I'd guess for 2), but I would appreciate a confirmation before breaking everything :) fabricius: joined #tikiwiki
joined #tikiwiki
joined #tikiwiki Jyhem: Hi trebmuh. Your guess of 2) is correct
Both lines do the same anyway. It's just a matter of following our PHP style guide/syntax rules. Nothing would break with 1) qwebirc1016958: joined #tikiwiki
left #tikiwiki fabricius: joined #tikiwiki jonnyb: joined #tikiwiki robertokir: joined #tikiwiki jonnyb: polom robertokir: moloq! luciash: pompom Jyhem: pompompom trebmuh: Jyhem, ok, thank you
ok, I've pushed to 19.x : https://sourceforge.net/p/tikiwiki/code/68543/
please, knowledgeable people, let me know if something is wrong there
I'm on the way to backport to 18.x and 15.x too luciash: trebmuh: thank you, your change looks good to me -: luciash just wonders why we have setLink and then setlink in the next elseif trebmuh: backport done to 18.x : https://sourceforge.net/p/tikiwiki/code/68544/
backport done to 15.x : https://sourceforge.net/p/tikiwiki/code/68545/ fabricius: joined #tikiwiki trebmuh: and a backport done to 12.x : https://sourceforge.net/p/tikiwiki/code/68545/
(I know that 12.x is EOL but anyway, the patch is now there for 12.x users if needed)
luciash, Jyhem and all, I think I'm all good for this fix now, let me know if something else is needed
thank you for you help, for your support, and for Tiki!
BTW, don't I need to make the fix goes to trunk as well ? Jyhem: trebmuh: you are welcome. Thank you for contributing.
no, the fix does not go to trunk as we are still in a semi-auto 19⇔trunk synchronisation phase
so it will be merged some time luciash: Jyhem: do you see the setLink and setlink suspicious too? Jyhem: Hi luciash. I did not notice, and I'm in the the middle of putting som improvements in production right now jonnyb: joined #tikiwiki
joined #tikiwiki robertokir: joined #tikiwiki jonnyb: joined #tikiwiki fabricius: joined #tikiwiki fabricius1: joined #tikiwiki