Revision 1871
Added by Dietmar over 11 years ago
- bugfix Undefined variable: sName in .../framework/functions.php
- bugfix droplet ShowWysiwyg Undefined variable: module
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 | 14 |
|
| 15 |
23 Feb-2013 Build 1871 Dietmar Woellbrink (Luisehahne) |
|
| 16 |
# bugfix Undefined variable: sName in .../framework/functions.php |
|
| 17 |
# bugfix droplet ShowWysiwyg Undefined variable: module |
|
| 15 | 18 |
21 Feb-2013 Build 1870 Dietmar Woellbrink (Luisehahne) |
| 16 | 19 |
# solved installation issues |
| 17 | 20 |
! upgrade-script sanitize pages_directory before creating access files |
| branches/2.8.x/wb/upgrade-script.php | ||
|---|---|---|
| 42 | 42 |
|
| 43 | 43 |
} |
| 44 | 44 |
// solved wrong pages_directory value before creating access files |
| 45 |
$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` ';
|
|
| 46 |
$sql .= 'WHERE `name`=\'pages_directory\' ';
|
|
| 47 |
$sTmpDir = WbDatabase::getInstance()->get_one($sql);
|
|
| 48 |
$sTmpDir = ( (strpos($sTmpDir,'/',0)===false) && (strlen($sTmpDir)>1) ? '/'.$sTmpDir : rtrim($sTmpDir,'/') );
|
|
| 49 |
$sPagesDir = defined('PAGES_DIRECTORY') ? PAGES_DIRECTORY : '';
|
|
| 50 |
if(($sTmpDir != $sPagesDir)) {
|
|
| 51 |
$sql = 'UPDATE `'.TABLE_PREFIX.'settings` SET '
|
|
| 52 |
. '`value` = \''.$sTmpDir.'\' '
|
|
| 53 |
. 'WHERE `name`=\'pages_directory\' ';
|
|
| 54 |
if(!WbDatabase::getInstance()->query($sql) ) {}
|
|
| 45 |
$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` ' |
|
| 46 |
. 'WHERE `name`=\'pages_directory\'';
|
|
| 47 |
$sPagesDirectory = WbDatabase::getInstance()->get_one($sql);
|
|
| 48 |
$sTmp = trim($sPagesDirectory, '/');
|
|
| 49 |
$sTmp = ($sTmp == '' ? '' : '/'.$sTmp);
|
|
| 50 |
if($sTmp != $sPagesDirectory) {
|
|
| 51 |
$sql = 'UPDATE `'.TABLE_PREFIX.'settings` '
|
|
| 52 |
. 'SET `value` = \''.$sTmpDir.'\' '
|
|
| 53 |
. 'WHERE `name`=\'pages_directory\' ';
|
|
| 54 |
WbDatabase::getInstance()->query($sql);
|
|
| 55 | 55 |
} |
| 56 | 56 |
//require_once(WB_PATH.'/framework/class.admin.php'); |
| 57 | 57 |
if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
|
| 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', '1870');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1871');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/framework/functions.php | ||
|---|---|---|
| 809 | 809 |
// if OS is not windows then chmod the new file |
| 810 | 810 |
if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
|
| 811 | 811 |
// sanitize filemode to 'o-x/g-x/u-x/o+rw' and chmod the new file |
| 812 |
$bRetval = chmod($sName, ((OCTAL_FILE_MODE & ~0111)|0600)); |
|
| 812 |
$bRetval = chmod($sFileName, ((OCTAL_FILE_MODE & ~0111)|0600));
|
|
| 813 | 813 |
} |
| 814 | 814 |
}else {
|
| 815 | 815 |
$sError = $MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']; |
| branches/2.8.x/wb/modules/droplets/example/ShowWysiwyg.php | ||
|---|---|---|
| 1 | 1 |
//:Display one defined WYSIWYG section |
| 2 | 2 |
//:Use [[ShowWysiwyg?section=10]] |
| 3 |
global $database, $section_id; |
|
| 3 |
global $database, $section_id, $module;
|
|
| 4 | 4 |
$content = ''; |
| 5 | 5 |
$section = isset($section) ? intval($section) : 0; |
| 6 | 6 |
if ($section) {
|
Also available in: Unified diff