Project

General

Profile

« Previous | Next » 

Revision 2115

Added by darkviper almost 10 years ago

+ framework/UpgradeHelper additiona vars to method convInfoIni2InfoPhp()
! module/show_menu2/ the directoryname of this 'Snippet' has been changed to ShowMenu2.
- show_menu2: The Flag SM2::BUFFER has been removed
+ show_menu2: The Flag SM2::NOBUFFER was added

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
01 Dec-2014 Build 2114 Manuela v.d.Decken(DarkViper)
15
+ framework/UpgradeHelper additiona vars to method convInfoIni2InfoPhp()
16
! module/show_menu2/ the directoryname of this 'Snippet' has been changed to ShowMenu2.
17
- show_menu2: The Flag SM2::BUFFER has been removed
18
+ show_menu2: The Flag SM2::NOBUFFER was added
14 19
01 Dec-2014 Build 2113 Manuela v.d.Decken(DarkViper)
15 20
+ framework/UpgradeHelper added new method convInfoIni2InfoPhp()
16 21
25 Nov-2014 Build 2112 Manuela v.d.Decken(DarkViper)
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.4');
54
if(!defined('REVISION')) define('REVISION', '2113');
54
if(!defined('REVISION')) define('REVISION', '2114');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/framework/UpgradeHelper.php
340 340
		return $aRetval;
341 341
	}
342 342

  
343

  
343
/**
344
 * import info.ini as 'old style' variables
345
 * @param string $sIniDir the directory where the info.ini is located
346
 * @return array of settings or null on error
347
 */
344 348
    static public function convInfoIni2InfoPhp($sIniDir)
345 349
    {
346 350
        $aVarTypePrefixes = array(
......
351 355
            'snippet'  => 'module'
352 356
        );
353 357
        $aNeededVars = array_flip(
354
            array('directory','name','function','version','platform','author','license','license_terms','description')
358
            array(
359
                'directory','name','function','version','platform','platform_versions',
360
                'platform_minPHP','author','license','license_terms','description'
361
            )
355 362
        );
356 363
        $aRetval = array();
357 364
        $sIniDir = rtrim(str_replace('\\', '/', $sIniDir), '/').'/';
......
371 378
                    $aRetval['platform'] = $ini['platform']['versions'];
372 379
                    unset($aNeededVars['platform']);
373 380
                }
381
                if (isset($ini['platform']['versions'])) {
382
                    $aRetval['platform_versions'] = $ini['platform']['versions'];
383
                    unset($aNeededVars['platform_versions']);
384
                }
385
                if (isset($ini['platform']['minPHP'])) {
386
                    $aRetval['platform_minPHP'] = $ini['platform']['minPHP'];
387
                    unset($aNeededVars['platform_minPHP']);
388
                }
374 389
                if  (sizeof($aNeededVars) > 0) {
375 390
                    return null;
376 391
                }

Also available in: Unified diff