even if the database version is 331, the upgrade script tries to upgrade the current db.

It seems that the current version check routine was deleted by mistake.

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/branches/branch-3-3@336 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/nucleus/upgrades/index.php b/utf8/nucleus/upgrades/index.php
index e300aca..ef8eb60 100755 (executable)
--- a/utf8/nucleus/upgrades/index.php
+++ b/utf8/nucleus/upgrades/index.php
@@ -12,8 +12,8 @@
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2007 The Nucleus Group
- * @version $Id: index.php,v 1.11.2.2 2007-10-24 02:57:16 andy Exp $
- * $NucleusJP: index.php,v 1.11.2.1 2007/10/23 07:26:41 kimitake Exp $
+ * @version $Id: index.php,v 1.11.2.3 2007-10-24 05:08:19 kimitake Exp $
+ * $NucleusJP: index.php,v 1.11.2.2 2007/10/24 02:57:16 andy Exp $
  *
  */
 
@@ -54,10 +54,19 @@ upgrade_head();
   else  if (!upgrade_checkinstall(31)) $current = 30;
   else  if (!upgrade_checkinstall(32)) $current = 31;
   else  if (!upgrade_checkinstall(33)) $current = 32;
-  else  $current = 33;
-
+  else  if (!upgrade_checkinstall(331)) $current = 33;
+  else  $current = 331;
+
+  if ($current == 331) {        
+         ?>     
+           <p class="ok">自動でできるアップグレードはありません。データベースは既に最新の Nucleus 用にアップデートされています。</p>     
+         <?php          
+   } else {
        ?>
          <p class="warning"><a href="upgrade.php?from=<?php echo $current?>">ここをクリックしてデータベースを Nucleus v3.31 用にアップグレードします</a></p>
+         <?php          
+   }    
+ ?>     
 
 <div class="note">
 <b>注意:</b> 作業中、各ステップごとにデータベースのバックアップを忘れないようにして下さい。