mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Bugtracker #5065 - php-extension bbcode files have to be prefixed 'bb_' to reduce chance of conflict with existing files

Browse Source
This commit is contained in:
e107steved
2010-09-18 14:32:31 +00:00
parent 2c587547be
commit d7e6cd40ad
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
e107_core/bbcodes/youtube.php → e107_core/bbcodes/bb_youtube.php
View File

16
e107_handlers/bbcode_handler.php
View File

@@ -322,22 +322,24 @@ class e_bbcode
{ // Find the file { // Find the file
if ($this->bbLocation[$code] == 'core') if ($this->bbLocation[$code] == 'core')
{ {
$bbFile = e_CORE.'bbcodes/'.strtolower(str_replace('_', '', $code)); $bbPath = e_CORE.'bbcodes/';
$bbFile = strtolower(str_replace('_', '', $code));
} }
else else
{ // Add code to check for plugin bbcode addition { // Add code to check for plugin bbcode addition
$bbFile = e_PLUGIN.$this->bbLocation[$code].'/'.strtolower($code); $bbPath = e_PLUGIN.$this->bbLocation[$code].'/';
$bbFile = strtolower($code);
} }
if (file_exists($bbFile.'.php')) if (file_exists($bbPath.'bb_'.$bbFile.'.php'))
{ // Its a bbcode class file { // Its a bbcode class file
require_once($bbFile.'.php'); require_once($bbPath.'bb_'.$bbFile.'.php');
//echo "Load: {$bbFile}.php -->".$code_text.'<br />'; //echo "Load: {$bbFile}.php<br />";
$className = 'bb_'.$code; $className = 'bb_'.$code;
$this->bbList[$code] = new $className(); $this->bbList[$code] = new $className();
} }
elseif (file_exists($bbFile.'.bb')) elseif (file_exists($bbPath.$bbFile.'.bb'))
{ {
$bbcode = file_get_contents($bbFile.'.bb'); $bbcode = file_get_contents($bbPath.$bbFile.'.bb');
$this->bbList[$code] = $bbcode; $this->bbList[$code] = $bbcode;
} }
else else