Revision 1408
Added by DarkViper almost 14 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
11 | 11 |
! = Update/Change |
12 | 12 |
|
13 | 13 |
------------------------------------- 2.8.2 ------------------------------------- |
14 |
23 Jan-2011 Build 1408 Werner v.d.Decken(DarkViper) |
|
15 |
# small changes in sm2menu() [SM2_NO_TITLE + SM2_XHTML_STRICT] |
|
14 | 16 |
22 Jan-2011 Build 1407 Frank Heyne (FrankH) |
15 | 17 |
# various Security fixes, thanks to secunia and others |
16 | 18 |
22 Jan-2011 Build 1406 Frank Heyne (FrankH) |
branches/2.8.x/wb/admin/interface/version.php | ||
---|---|---|
52 | 52 |
|
53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.2.RC5'); |
55 |
if(!defined('REVISION')) define('REVISION', '1407');
|
|
55 |
if(!defined('REVISION')) define('REVISION', '1408');
|
|
56 | 56 |
|
57 | 57 |
?> |
branches/2.8.x/wb/modules/show_menu2/include.php | ||
---|---|---|
216 | 216 |
// replace the keywords |
217 | 217 |
function replace($aMatch) { |
218 | 218 |
$retval = '['.$aMatch.'=UNKNOWN]'; |
219 |
$retval_1 = ''; |
|
220 | 219 |
switch ($aMatch) { |
221 | 220 |
case 'a': |
222 |
$retval_1 = '<a href="'.$this->url.'"'; |
|
221 |
$retval = '<a href="'.$this->url.'"'; |
|
222 |
// break; // ignore 'break' to add the rest of <a>-tag |
|
223 | 223 |
case 'ac': |
224 |
$retval = '<a href="'.$this->url.'" class="'.$this->currClass.'"'; |
|
225 |
$retval = ($retval_1 == '') ? $retval : $retval_1; |
|
226 |
if(($this->flags & SM2_XHTML_STRICT)) { |
|
227 |
$retval .= ' title="'.(($this->flags & SM2_NO_TITLE) ? ' ' : $this->page['tooltip']).'"'; |
|
224 |
if( substr($retval, 0, 2) != '<a'){ |
|
225 |
$retval = '<a href="'.$this->url.'" class="'.$this->currClass.'"'; |
|
228 | 226 |
} |
229 |
else { |
|
227 |
if(($this->flags & SM2_NO_TITLE)) { |
|
228 |
$retval .= ' title="'.$this->page['tooltip'].'"'; |
|
229 |
} |
|
230 |
if(!($this->flags & SM2_XHTML_STRICT)) { |
|
230 | 231 |
$retval .= ' target="'.$this->page['target'].'"'; |
231 |
$retval .= ($this->flags & SM2_NO_TITLE) ? '' : ' title="'.$this->page['tooltip'].'"'; |
|
232 | 232 |
} |
233 | 233 |
$retval .= '>'; |
234 | 234 |
break; |
Also available in: Unified diff
small changes in handling of SM2_NO_TITLE ans SM2_XHTML_STRICT