diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-28 15:42:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-28 15:42:06 +0000 |
| commit | d5b6b9cf852c16ed627fe38a6b34e39bfca73a18 (patch) | |
| tree | 86bdfc4c87518110790f5fa1d8a79e55dd3297aa | |
| parent | 1526ae1fc8c3b750df511fd286fc7d3166e6e9b3 (diff) | |
| download | forums-d5b6b9cf852c16ed627fe38a6b34e39bfca73a18.tar forums-d5b6b9cf852c16ed627fe38a6b34e39bfca73a18.tar.gz forums-d5b6b9cf852c16ed627fe38a6b34e39bfca73a18.tar.bz2 forums-d5b6b9cf852c16ed627fe38a6b34e39bfca73a18.tar.xz forums-d5b6b9cf852c16ed627fe38a6b34e39bfca73a18.zip | |
- get every bbcode tpl block defined within bbcode.html. ;) (#1889)
git-svn-id: file:///svn/phpbb/trunk@5977 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/bbcode.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 98bdb3bfcc..9ac850fb6e 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -369,8 +369,13 @@ class bbcode $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]); } } diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index bf15a0b3ca..39fe8e9f1d 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -76,7 +76,7 @@ class session // We are on the base level (phpBB root == webroot), lets adjust the variables a bit... 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( |