Revision 1888
Added by Dietmar over 11 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 |
12 Mar-2013 Build 1888 Dietmar Woellbrink (Luisehahne) |
|
| 15 |
# fixed Deprecated: preg_replace(): modules\show_menu2\include.php |
|
| 16 |
The /e modifier is deprecated, replaced with preg_replace_callback |
|
| 14 | 17 |
12 Mar-2013 Build 1887 Dietmar Woellbrink (Luisehahne) |
| 15 | 18 |
# bugfix Notice: Constant messages during new WB installation |
| 16 | 19 |
! update WbDatabase SqlImport parameter, |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.3');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1887');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1888');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/modules/show_menu2/include.php | ||
|---|---|---|
| 206 | 206 |
// find and replace all keywords |
| 207 | 207 |
function format2(&$aCurrItem) {
|
| 208 | 208 |
if (!is_string($aCurrItem)) return ''; |
| 209 |
return preg_replace( |
|
| 209 |
return preg_replace_callback(
|
|
| 210 | 210 |
'@\[('.
|
| 211 | 211 |
'a|ac|/a|li|/li|ul|/ul|menu_title|menu_icon_0|menu_icon_1|'. |
| 212 |
'page_title|page_icon|url|target|page_id|tooltip|'.
|
|
| 212 |
'page_title|page_icon|url|target|page_id|tooltip|'.
|
|
| 213 | 213 |
'parent|level|sib|sibCount|class|description|keywords|'. |
| 214 | 214 |
SM2_CONDITIONAL. |
| 215 |
')\]@e', |
|
| 216 |
'$this->replace("\1")', $aCurrItem);
|
|
| 215 |
')\]@', |
|
| 216 |
array($this, 'replace'), |
|
| 217 |
$aCurrItem); |
|
| 217 | 218 |
} |
| 218 | 219 |
|
| 219 | 220 |
// replace the keywords |
| 220 |
function replace($aMatch) {
|
|
| 221 |
function replace($aMatches) {
|
|
| 222 |
$aMatch = $aMatches[1]; |
|
| 221 | 223 |
$retval = '['.$aMatch.'=UNKNOWN]'; |
| 222 | 224 |
switch ($aMatch) {
|
| 223 | 225 |
case 'a': |
| ... | ... | |
| 847 | 849 |
$aFormatter->finishList(); |
| 848 | 850 |
} |
| 849 | 851 |
} |
| 850 |
|
|
Also available in: Unified diff
The /e modifier is deprecated, replaced with preg_replace_callback