mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00
Code Issues Releases Wiki Activity

0.7 -> 0.8 upgrade fixes

Browse Source
This commit is contained in:
CaMer0n
2009-11-19 13:46:29 +00:00
parent c321774aa6
commit c40c26478d
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_files/bbcode/img.bb
View File

@@ -1,4 +1,4 @@
// $Id: img.bb,v 1.13 2009-09-05 08:23:55 e107steved Exp $
// $Id: img.bb,v 1.14 2009-11-19 13:46:18 e107coders Exp $
// General purpose image bbcode. As well as the obvious insertion of a picture:
// a) if filname begins with 'th_' or 'thumb_', creates link to main image opening in new window
@@ -21,8 +21,8 @@ $replace = array(''', e_IMAGE_ABS, e_FILE_ABS, e_IMAGE_ABS, e_FILE_ABS);
$replaceInt = array(''', e_IMAGE, e_FILE, e_IMAGE, e_FILE);
$intName = str_replace($search, $replaceInt, $code_text); // Server-relative file names
unset($imgParms);
//$imgParms['class']="bbcode";
$imgParms['class']='floatnone'; // This will be overridden if a new class is specified
$imgParms['class']="bbcode floatnone"; // This will be overridden if a new class is specified
$imgParms['alt']='';
$code_text = str_replace($search, $replace, $code_text);

13
e107_handlers/e_parse_class.php
View File

@@ -9,8 +9,8 @@
* Text processing and parsing functions
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
* $Revision: 1.85 $
* $Date: 2009-11-18 01:04:43 $
* $Revision: 1.86 $
* $Date: 2009-11-19 13:46:24 $
* $Author: e107coders $
*
*/
@@ -1500,6 +1500,7 @@ class e_parse
*/
public function replaceConstants($text, $mode = '', $all = FALSE)
{
if($mode != "")
{
$e107 = e107::getInstance();
@@ -1584,7 +1585,7 @@ class e_parse
$replace_absolute[] = '';
}
$search[] = "{USERID}";
}
}
$replace = ((string)$mode == "full" || (string)$mode=='abs' ) ? $replace_absolute : $replace_relative;
return str_replace($search,$replace,$text);
@@ -1599,6 +1600,12 @@ class e_parse
//if not already parsed by doReplace
$text = str_replace(array('{THEME}', '{THEME_ABS}'), '', $text);
}
else
{
$srch = array('{THEME}', '{THEME_ABS}');
$repl = array(THEME, THEME_ABS);
$text = str_replace($srch, $repl, $text);
}
return $text;
}

6
e107_plugins/banner/banner.php
View File

@@ -9,8 +9,8 @@
*
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/banner/banner.php,v $
* $Revision: 1.2 $
* $Date: 2009-09-18 22:20:39 $
* $Revision: 1.3 $
* $Date: 2009-11-19 13:46:29 $
* $Author: e107coders $
*/
@@ -24,7 +24,7 @@ if (!e107::isInstalled('banner'))
header("location:".e_BASE."index.php");
}
e107::getLan(e_PLUGIN."banner/languages/".e_LANGUAGE."_banner.php");
e107::includeLan(e_PLUGIN."banner/languages/".e_LANGUAGE."_banner.php");
require_once(e_HANDLER."form_handler.php");
$rs = new form;