X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Fconvert%2Ffunctions.inc.php;h=6f27dfdd32fbf12fdf2cbd44050912d0989595c7;hp=be81999528afbd8b42a77038b897e00027549e88;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=6575e866f3fd1938601432841d80f82e9d259265

diff --git a/nucleus/convert/functions.inc.php b/nucleus/convert/functions.inc.php
index be81999..6f27dfd 100644
--- a/nucleus/convert/functions.inc.php
+++ b/nucleus/convert/functions.inc.php
@@ -808,7 +808,11 @@ class BlogImport {
 
 		if ( DB::execute($query) === FALSE )
 		{
+<<<<<<< HEAD
+			die("Error while executing query: " . $query);
+=======
 			die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
 		}
 
 		return DB::getInsertId();
@@ -822,10 +826,17 @@ class BlogImport {
 		DB::execute('INSERT INTO '.sql_table('category')." (CNAME, CDESC) VALUES ('General','Items that do not fit in another category')");
 		$defcat = DB::getInsertId();
 
+<<<<<<< HEAD
+		$query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ('$name','$shortname',1 ,0, $defcat)";
+		if ( DB::execute($query) === FALSE )
+		{
+			die("Error while executing query: " . $query);
+=======
 		$query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ($name, $shortname, 1, 0, $defcat)";
 		if ( DB::execute($query) === FALSE )
 		{
 			die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
 		}
 		$id = DB::getInsertId();
 
@@ -852,7 +863,11 @@ class BlogImport {
 
 		if ( DB::execute($query) === FALSE )
 		{
+<<<<<<< HEAD
+			die("Error while executing query: " . $query);
+=======
 			die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
 		}
 
 		return DB::getInsertId();
@@ -865,7 +880,11 @@ class BlogImport {
 
 		if ( DB::execute($query) === FALSE )
 		{
+<<<<<<< HEAD
+			die("Error while executing query: " . $query);
+=======
 			die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
 		}
 
 		return DB::getInsertId();
@@ -904,7 +923,11 @@ if ($ver > 250)
 
 		if ( DB::execute($query) === FALSE )
 		{
+<<<<<<< HEAD
+			die("Error while executing query: " . $query);
+=======
 			die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
 		}
 
 		return DB::getInsertId();
@@ -920,10 +943,17 @@ if ($ver > 250)
 		DB::execute('INSERT INTO '.sql_table('category')." (CNAME, CDESC) VALUES ('General','Items that do not fit in another categort')");
 		$defcat = DB::getInsertId();
 
+<<<<<<< HEAD
+		$query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ('$name','$shortname',1 ,0, $defcat)";
+		if ( DB::execute($query) === FALSE )
+		{
+			die("Error while executing query: " . $query);
+=======
 		$query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ($name, $shortname, 1, 0, $defcat)";
 		if ( DB::execute($query) === FALSE )
 		{
 			die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
 		}
 		$id = DB::getInsertId();