Changeset 1468:3132a0aca046 for admin/update.php

Timestamp:

08/19/13 09:55:29 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1466:e67efe636ce1 (diff), 1467:917fc08f3a59 (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 commits into default branch (should be verified)

Files:

• admin/update.php (modified) (4 diffs)
• admin/update.php (modified) (1 diff)

admin/update.php

@@ -27 +27 @@
 
 $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
-$new_v = $updater->check(DC_VERSION);
+$new_v = $updater->check(DC_VERSION, !empty($_GET['nocache']));
 $zip_file = $new_v ? DC_BACKUP_PATH.'/'.basename($updater->getFileURL()) : '';
 $version_info = $new_v ? $updater->getInfoURL() : '';
@@ -168 +168 @@
 -------------------------------------------------------- */
 dcPage::open(__('Dotclear update'),
-     (!$step ? dcPage::jsPageTabs($default_tab) : ''),
+     (!$step ? 
+          dcPage::jsPageTabs($default_tab).
+          dcPage::jsLoad('js/_update.js')
+          : ''),
      dcPage::breadcrumb(
           array(
@@ -176 +179 @@
 );
 
+if (!$core->error->flag()) {
+     echo '<h2>'.__('Dotclear update').'</h2>';
+     
+     if (!empty($_GET['nocache'])) {
+          dcPage::message(__('Manual checking of update done successfully.'));
+     }
+}
+
 if (!$step)
 {
@@ -181 +192 @@
      if (empty($new_v))
      {
-          echo '<p><strong>'.__('No newer Dotclear version available.').'</strong></p>';
+          echo '<p><strong>'.__('No newer Dotclear version available.').'</strong></p>'.
+          '<form action="'.$p_url.'" method="get">'.
+          '<p><input type="hidden" name="nocache" value="1" />'.
+          '<input type="submit" value="'.__('Force checking update Dotclear').'" /></p>'.
+          '</form>';
      }
      else

admin/update.php

@@ -171 +171 @@
           dcPage::jsPageTabs($default_tab).
           dcPage::jsLoad('js/_update.js')
-     : '')
+          : ''),
+     dcPage::breadcrumb(
+          array(
+               __('System') => '',
+               '<span class="page-title">'.__('Dotclear update').'</span>' => ''
+          ))
 );