mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-12 02:25:18 +02:00
Code Issues Releases Wiki Activity

- get every bbcode tpl block defined within bbcode.html. ;) (#1889)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5977 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-05-28 15:42:06 +00:00
parent 1526ae1fc8
commit d5b6b9cf85
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/bbcode.php
View File

@ -369,8 +369,13 @@ class bbcode
$matches = preg_match_all('#<!-- BEGIN (.*?) -->(.*?)<!-- END (?:.*?) -->#', $tpl, $match); $matches = preg_match_all('#<!-- BEGIN (.*?) -->(.*?)<!-- END (?:.*?) -->#', $tpl, $match);
for ($i = 0; $i < $matches - 1; $i++) for ($i = 0; $i < $matches; $i++)
{ {
if (empty($match[1][$i]))
{
continue;
}
$this->bbcode_template[$match[1][$i]] = $this->bbcode_tpl_replace($match[1][$i], $match[2][$i]); $this->bbcode_template[$match[1][$i]] = $this->bbcode_tpl_replace($match[1][$i], $match[2][$i]);
} }
} }

2
phpBB/includes/session.php
View File

@ -76,7 +76,7 @@ class session
// We are on the base level (phpBB root == webroot), lets adjust the variables a bit... // We are on the base level (phpBB root == webroot), lets adjust the variables a bit...
if (!$root_script_path) if (!$root_script_path)
{ {
$root_script_path = ($page_dir) ? str_replace($page_dir, '', $script_path) : $script_path;; $root_script_path = ($page_dir) ? str_replace($page_dir, '', $script_path) : $script_path;
} }
$page_array += array( $page_array += array(