Dotclear


Ignore:
Timestamp:
08/08/13 20:57:54 (11 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Parents:
1281:adc66344a752 (diff), 1289:0495340e6e77 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge 2.5 / default

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • admin/update.php

    r1280 r1290  
    5454} 
    5555if (!empty($archives)) { 
    56      $archives = array_reverse($archives); 
     56     usort($archives,"version_compare"); 
    5757} else { 
    5858     $default_tab = 'update'; 
     
    208208           
    209209          echo '<form action="'.$p_url.'" method="post">'; 
    210            
    211210          foreach ($archives as $v) { 
    212211               echo 
  • admin/update.php

    r1287 r1290  
    2727 
    2828$updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions'); 
    29 $new_v = $updater->check(DC_VERSION, !empty($_GET['nocache'])); 
     29$new_v = $updater->check(DC_VERSION); 
    3030$zip_file = $new_v ? DC_BACKUP_PATH.'/'.basename($updater->getFileURL()) : ''; 
    3131$version_info = $new_v ? $updater->getInfoURL() : ''; 
     
    173173if (!$core->error->flag()) { 
    174174     echo '<h2>'.__('Dotclear update').'</h2>'; 
    175       
    176      if (!empty($_GET['nocache'])) { 
    177           dcPage::message(__('Manual checking of update done successfully.')); 
    178      } 
    179175} 
    180176 
     
    184180     if (empty($new_v)) 
    185181     { 
    186           echo '<p><strong>'.__('No newer Dotclear version available.').'</strong></p>'. 
    187           '<form action="'.$p_url.'" method="get">'. 
    188           '<p><input type="hidden" name="nocache" value="1" />'. 
    189           '<input type="submit" value="'.__('Force checking update Dotclear').'" /></p>'. 
    190           '</form>'; 
     182          echo '<p><strong>'.__('No newer Dotclear version available.').'</strong></p>'; 
    191183     } 
    192184     else 
Note: See TracChangeset for help on using the changeset viewer.

Sites map