Project

General

Profile

« Previous | Next » 

Revision 1858

Added by Dietmar almost 12 years ago

- remove MODULES_UPGRADE_LIST input from saettings

View differences:

branches/2.8.x/CHANGELOG
12 12
===============================================================================
13 13

  
14 14

  
15
08 Jan-2013 Build 1858 Dietmar Woellbrink (Luisehahne)
16
- remove MODULES_UPGRADE_LIST input from saettings
15 17
08 Jan-2013 Build 1857 Dietmar Woellbrink (Luisehahne)
16 18
+ add deleted files and images in jqauery
17 19
08 Jan-2013 Build 1856 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/upgrade-script.php
544 544

  
545 545
    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
546 546

  
547
    /**********************************************************
548
     *  - Adding dev_infos to settings table
549
     */
550
    $aDebugMessage[] = "<span>Adding/updating modules_upgrade_list to settings table</span>";
551
    $cfg = array(
552
    	'modules_upgrade_list' => (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : 'news')
553
    );
554

  
555
    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
556

  
557

  
558 547
if($bDebugModus) {
559 548
    echo implode(PHP_EOL,$aDebugMessage);
560 549
}
......
998 987
     * upgrade modules if newer version is available
999 988
     * $aModuleList list of proofed modules
1000 989
     */
1001
    $sModuleList = 'news,wysiwyg,form';
1002
    $aModuleList = explode(',', (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : $sModuleList));
990
    $aModuleList = array('news','wysiwyg','form');
1003 991
    echo '<h3>Step '.(++$stepID).': Upgrade proofed modules</h3>';
1004
//	$aModuleList = array('news');
1005 992
	foreach($aModuleList as $sModul) {
1006 993
		if(file_exists(WB_PATH.'/modules/'.$sModul.'/upgrade.php')) {
1007 994
			$currModulVersion = get_modul_version ($sModul, false);
branches/2.8.x/wb/admin/skel/themes/htt/settings.htt
589 589
		</div>
590 590

  
591 591
		<div class="mbox sub-row">
592
	 		<label class="setting_name">{TEXT_MODULES_DIRECTORY}:</label>
593
			<div class="input" >
594
				<input type="text" name="modules_upgrade_list" value="{MODULES_UPGRADE_LIST}" />
595
			</div>
596
		</div>
597

  
598
		<div class="mbox sub-row">
599 592
	 		<label class="setting_name">{TEXT_PAGE_ICON_DIR}:</label>
600 593
			<div class="input" >
601 594
			<input type="text" id="page_icon_dir" name="page_icon_dir" value="{PAGE_ICON_DIR}" />
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', '1857');
54
if(!defined('REVISION')) define('REVISION', '1858');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/admin/settings/save.php
185 185
    'rename_files_on_upload',
186 186
    'page_spacer',
187 187
    'page_icon_dir',
188
    'modules_upgrade_list'
189 188
    );
190 189
$disallow_in_fields = array(
191 190
    'pages_directory',
......
205 204
    'rename_files_on_upload',
206 205
    'page_spacer',
207 206
    'page_icon_dir',
208
    'modules_upgrade_list'
209 207
    );
210 208

  
211 209
// Query current settings in the db, then loop through them and update the db with the new value
branches/2.8.x/wb/admin/settings/index.php
36 36
$cfg = array(
37 37
	'wbmail_signature' => defined('WBMAIL_SIGNATURE') ? WBMAIL_SIGNATURE : '',
38 38
	'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0'),
39
	'modules_upgrade_list' => (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : ''),
40 39
	'page_extendet' => (defined('PAGE_EXTENDET') ? PAGE_EXTENDET : 'true'),
41 40
	);
42 41
db_update_key_value( 'settings', $cfg );
......
1032 1031
		'PAGES_DIRECTORY' => PAGES_DIRECTORY,
1033 1032
		'PAGES_READONLY' => $sReadOnly,
1034 1033
		'PAGES_EDIT_TYPE' => $sPagesEditType,
1035
		'MODULES_DIRECTORY' => MODULES_UPGRADE_LIST,
1036 1034
		'PAGE_ICON_DIR'   => PAGE_ICON_DIR,
1037 1035
		'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
1038 1036
		'PAGE_EXTENSION' => PAGE_EXTENSION,
branches/2.8.x/wb/install/save.php
418 418
	." (58, 'wbmail_signature', ''),"
419 419
	." (59, 'confirmed_registration', '1'),"
420 420
	." (60, 'page_extendet', 'true'),"
421
	." (61, 'modules_upgrade_list', 'news,wysiwyg,form'),"
422 421
	." (62, 'system_locked', '0')";
423 422
	if(!$database->query($settings_rows)) { set_error($database->get_error()); }
424 423

  

Also available in: Unified diff