makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

*** empty log message ***

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6294 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-08-17 01:15:01 +00:00
parent 481f090a39
commit e6be1795ca
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
phpBB/includes/message_parser.php
View file

@ -62,25 +62,14 @@ class bbcode_firstpass extends bbcode
} }
else else
{ {
// TODO: Review this
$found = false;
foreach ($bbcode_data['regexp'] as $regexp => $replacement) foreach ($bbcode_data['regexp'] as $regexp => $replacement)
{ {
if (!$found) // The pattern gets compiled and cached by the PCRE extension,
// it should not demand recompilation
if (preg_match($regexp, $this->message))
{ {
$before = strlen($this->message);
}
$this->message = preg_replace($regexp, $replacement, $this->message); $this->message = preg_replace($regexp, $replacement, $this->message);
if (!$found)
{
$after = strlen($this->message);
if ($before != $after)
{
// Because we add bbcode_uid to all tags, the message length
// will increase whenever a tag is found
$bitfield->set($bbcode_data['bbcode_id']); $bitfield->set($bbcode_data['bbcode_id']);
$found = true;
}
} }
} }
} }

2
phpBB/language/en/acp/database.php
View file

@ -31,7 +31,7 @@ if (empty($lang) || !is_array($lang))
// Banning // Banning
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'DATABASE' => 'Database Utilities', 'DATABASE' => 'Database Utilities',
'ACP_BACKUP_EXPLAIN' => 'Here you can backup all your phpBB related data. You may store the resulting archive in your store/ folder or download it directly. Depending on your server configuration you be able to compress the file in a number of formats. If you wish to include any additional "custom" tables please list them in the additional tables field, separated by commas. ', 'ACP_BACKUP_EXPLAIN' => 'Here you can backup all your phpBB related data. You may store the resulting archive in your store/ folder or download it directly. Depending on your server configuration you be able to compress the file in a number of formats.',
'BACKUP_OPTIONS' => 'Backup options', 'BACKUP_OPTIONS' => 'Backup options',
'BACKUP_TYPE' => 'Backup type', 'BACKUP_TYPE' => 'Backup type',
'BACKUP_INVALID' => 'The selected file to backup is invalid', 'BACKUP_INVALID' => 'The selected file to backup is invalid',