Changeset 26401


Ignore:
Timestamp:
Jan 2, 2014, 4:04:16 PM (7 years ago)
Author:
plg
Message:

feature 3016: upgrade script to Piwigo 2.6

Location:
trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/themes/default/template/upgrade.tpl

    r25005 r26401  
    4040#content {
    4141  min-height:0;
     42  border:none;
    4243}
    4344
  • trunk/install/upgrade_2.4.0.php

    r21103 r26401  
    122122
    123123// now we upgrade from 2.5.0
    124 // include_once(PHPWG_ROOT_PATH.'install/upgrade_2.5.0.php');
     124include_once(PHPWG_ROOT_PATH.'install/upgrade_2.5.0.php');
    125125?>
  • trunk/upgrade.php

    r25018 r26401  
    336336  $current_release = '2.3.0';
    337337}
     338else if (!in_array('website_url', $columns_of[PREFIX_TABLE.'comments']))
     339{
     340  $current_release = '2.4.0';
     341}
    338342else
    339343{
     
    345349  $applied_upgrades = array_from_query($query, 'id');
    346350
    347   if (!in_array(134, $applied_upgrades))
    348   {
    349     $current_release = '2.4.0';
     351  if (!in_array(139, $applied_upgrades))
     352  {
     353    $current_release = '2.5.0';
    350354  }
    351355  else
     
    353357    // confirm that the database is in the same version as source code files
    354358    conf_update_param('piwigo_db_version', get_branch_from_version(PHPWG_VERSION));
    355    
     359
     360    header('Content-Type: text/html; charset='.get_pwg_charset());
    356361    echo 'No upgrade required, the database structure is up to date';
    357362    echo '<br><a href="index.php">← back to gallery</a>';
Note: See TracChangeset for help on using the changeset viewer.