mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-26 20:08:55 +00:00
git-svn-id: file:///svn/phpbb/trunk@7668 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
905beaa398
commit
d180ac3d02
2 changed files with 3 additions and 2 deletions
|
@ -196,10 +196,11 @@ p a {
|
||||||
<li>[Fix] Proper sync of data on topic copy (Bug #11335)</li>
|
<li>[Fix] Proper sync of data on topic copy (Bug #11335)</li>
|
||||||
<li>[Fix] Introduced ORDER BY clauses to converter queries (Bug #10697)</li>
|
<li>[Fix] Introduced ORDER BY clauses to converter queries (Bug #10697)</li>
|
||||||
<li>[Fix] added a sync to post counts during conversion (Bug #11421)</li>
|
<li>[Fix] added a sync to post counts during conversion (Bug #11421)</li>
|
||||||
<li>[Fix] Stopped bots from getting added to the registered users group during conversion(Bug #11283)</li>
|
<li>[Fix] Stopped bots from getting added to the registered users group during conversion (Bug #11283)</li>
|
||||||
<li>[Fix] Filled "SMILIEYS_DISABLED" template variable (Bug #11257)</li>
|
<li>[Fix] Filled "SMILIEYS_DISABLED" template variable (Bug #11257)</li>
|
||||||
<li>[Fix] Properly escaped the delimiter in disallowed username comparisons (Bug #11339)</li>
|
<li>[Fix] Properly escaped the delimiter in disallowed username comparisons (Bug #11339)</li>
|
||||||
<li>[Fix] Check global purge setting (Bug #11555)</li>
|
<li>[Fix] Check global purge setting (Bug #11555)</li>
|
||||||
|
<li>[Fix] Improper magic url parsing applied to already parsed [url=] bbcode tag (Bug #11429)</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -905,7 +905,7 @@ class bbcode_firstpass extends bbcode
|
||||||
$url = append_sid($url);
|
$url = append_sid($url);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ($var1) ? '[url=' . $this->bbcode_specialchars($url) . ':' . $this->bbcode_uid . ']' . $var2 . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($url) . '[/url:' . $this->bbcode_uid . ']';
|
return ($var1) ? '[url=' . $this->bbcode_specialchars($url) . ':' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($var2) . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($url) . '[/url:' . $this->bbcode_uid . ']';
|
||||||
}
|
}
|
||||||
|
|
||||||
return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]';
|
return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]';
|
||||||
|
|
Loading…
Add table
Reference in a new issue