Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / upgrades / upgrade.functions.php
diff --git a/nucleus/upgrades/upgrade.functions.php b/nucleus/upgrades/upgrade.functions.php

index c8a67c0..45b7e14 100644 (file)
--- a/nucleus/upgrades/upgrade.functions.php
+++ b/nucleus/upgrades/upgrade.functions.php
@@ -13,7 +13,7 @@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2012 The Nucleus Group
- * @version $Id: upgrade.functions.php 1690 2012-03-08 22:45:08Z ftruscot $
+ * @version $Id: upgrade.functions.php 1889 2012-06-17 08:46:45Z sakamocchi $
   */
  
         /**
@@ -147,9 +147,15 @@
                         break;
                 }
  
+<<<<<<< HEAD
                 $result = DB::getResult($query);
                 $installed = ( $result !== FALSE ) && ($result->rowCount() >= $minrows);
  
+=======
+               $result = mysql_query($query);
+               $installed = ( $result != 0 ) && (mysql_num_rows($result) >= $minrows);
+               
+>>>>>>> skinnable-master
                 return $installed;
         }
  
@@ -202,9 +208,9 @@
                 echo "<head>\n";
                 echo "<title> Nucleus Upgrade </title>\n";
                 
-               if ( file_exists('../styles/manual.css') )
+               if ( file_exists('../documentation/styles/manual.css') )
                 {
-                       echo "<link rel=\"stylesheet\" href=\"../styles/manual.css\" type=\"text/css\" />\n";
+                       echo "<link rel=\"stylesheet\" href=\"../documentation/styles/manual.css\" type=\"text/css\" />\n";
                 }
                 else
                 {