Changeset 12862

Show
Ignore:
Timestamp:
10/20/11 14:02:21 (2 years ago)
Author:
p_lindheimer
Message:

fixes #5418 including functions.inc.php will not bring in new one if upgrading from older systems

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.10/backup/install.php

    r12513 r12862  
    232232//migrate pre 2.10 backups 
    233233if ($db->getOne('SELECT COUNT(*) FROM backup_templates') < 1) { 
    234   require_once(dirname(__FILE__) . '/functions.inc.php'); 
     234  // Don't know which of these it needs, but including functions.inc.php won't work when ugprading form earlier releases as the old version will 
     235  // already be there. 
     236  $dir = dirname(__FILE__); 
     237  require_once($dir . '/functions.inc/class.backup.php'); 
     238  require_once($dir . '/functions.inc/backup.php'); 
     239  require_once($dir . '/functions.inc/servers.php'); 
     240  require_once($dir . '/functions.inc/templates.php'); 
     241  require_once($dir . '/functions.inc/restore.php'); 
     242   
    235243  //create default servers 
    236244  $server['legacy'] = array( 

  • modules/branches/2.10/backup/module.xml

    r12853 r12862  
    33  <repo>standard</repo> 
    44  <name>Backup &amp; Restore</name> 
    5   <version>2.10.0.1</version> 
     5  <version>2.10.0.2</version> 
    66  <publisher>Schmoozecom.com</publisher> 
    77  <license>GPLv2+</license> 
    …… 
    1818  </depends> 
    1919  <changelog> 
     20    *2.10.0.2* #5418 
    2021    *2.10.0.1* don't make jquery.jstree.min.js dynamic it blocks caching 
    2122    *2.10.0.0* Backup Module Rewrite