1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 07:36:32 +02:00

Bugtracker #2827, #3576, #3577 - stop linkwords appearing in places they shouldn't (code now has to explicitly enable them in various areas), match complete word/phrase only (no partials), fully case-insensitive match and display case exactly as found, don't process on admin pages

This commit is contained in:
e107steved
2007-01-17 21:29:28 +00:00
parent 89f0002765
commit 3733a94ce9
13 changed files with 273 additions and 122 deletions

View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/page.php,v $
| $Revision: 1.7 $
| $Date: 2007-01-17 13:36:57 $
| $Author: mrpete $
| $Revision: 1.8 $
| $Date: 2007-01-17 21:29:28 $
| $Author: e107steved $
|
+----------------------------------------------------------------------------+
*/
@@ -229,7 +229,7 @@ class pageClass
}
else
{
$this -> pageToRender = $tp -> toHTML($this -> pageText, TRUE, 'parse_sc, constants');
$this -> pageToRender = $tp -> toHTML($this -> pageText, TRUE, 'parse_sc, constants,hook=content');
return;
}
@@ -265,11 +265,11 @@ class pageClass
foreach($this -> pageTitles as $title)
{
$titlep = preg_replace("/\[newpage=(.*?)\]/", "\\1", $title);
$this -> pageTitles[$count] = ($titlep == "[newpage]" ? LAN_PAGE_13." ".($count+1)." " : $tp -> toHTML($titlep, TRUE, 'parse_sc, constants,emotes_off,no_make_clickable'));
$this -> pageTitles[$count] = ($titlep == "[newpage]" ? LAN_PAGE_13." ".($count+1)." " : $tp -> toHTML($titlep, TRUE, 'parse_sc, constants,emotes_off,no_make_clickable,hook=title'));
$count++;
}
$this -> pageToRender = $tp -> toHTML($pages[$this -> pageSelected], TRUE, 'parse_sc, constants');
$this -> pageToRender = $tp -> toHTML($pages[$this -> pageSelected], TRUE, 'parse_sc,constants,hook=content');
$this -> title = (substr($this -> pageTitles[$this -> pageSelected], -1) == ";" ? "" : $this -> pageTitles[$this -> pageSelected]);
if($this -> debug)