diff --git a/main/exercice/answer_admin.inc.php b/main/exercice/answer_admin.inc.php
index 0d973b58c0..0000c6a7ad 100644
--- a/main/exercice/answer_admin.inc.php
+++ b/main/exercice/answer_admin.inc.php
@@ -22,7 +22,7 @@
 *	This script allows to manage answers. It is included from the script admin.php
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: answer_admin.inc.php 18203 2009-02-03 18:02:16Z ndieschburg $
+* 	@version $Id: answer_admin.inc.php 18543 2009-02-17 15:04:15Z cfasanando $
 */
 
 
@@ -1160,7 +1160,7 @@ if($modifyAnswers)
 			?>
 			     
 			<?php
-			echo $desc = mysql_result($res,0,'description');
+			echo $desc = Database::result($res,0,'description');
 			 ?>
 
 			<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?modifyAnswers=<?php echo $modifyAnswers; ?>">
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index 2d057122c5..d1b871b3e7 100644
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -1,4 +1,4 @@
-<?php // $Id: question.class.php 18487 2009-02-13 04:02:46Z ivantcholakov $
+<?php // $Id: question.class.php 18543 2009-02-17 15:04:15Z cfasanando $
  
 /*
 ==============================================================================
@@ -28,7 +28,7 @@
 *	File containing the Question class.
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: question.class.php 18487 2009-02-13 04:02:46Z ivantcholakov $
+* 	@version $Id: question.class.php 18543 2009-02-17 15:04:15Z cfasanando $
 */
 
 
@@ -622,7 +622,7 @@ abstract class Question
 		{
 			$sql="SELECT max(position) FROM $TBL_QUESTIONS as question, $TBL_EXERCICE_QUESTION as test_question WHERE question.id=test_question.question_id AND test_question.exercice_id='".Database::escape_string($exerciseId)."'";
 			$result=api_sql_query($sql);
-			$current_position=mysql_result($result,0,0);
+			$current_position=Database::result($result,0,0);
 			$this -> updatePosition($current_position+1);
 			$position = $this -> position;
 			
diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php
index b80f266c32..bf8a6c8dbc 100644
--- a/main/inc/lib/database.lib.php
+++ b/main/inc/lib/database.lib.php
@@ -1,4 +1,4 @@
-<?php // $Id: database.lib.php 18504 2009-02-14 01:09:21Z yannoo $
+<?php // $Id: database.lib.php 18543 2009-02-17 15:04:15Z cfasanando $
 /* See license terms in /dokeos_license.txt */
 /**
 ==============================================================================
@@ -755,14 +755,16 @@ class Database
 	 */
 	function result($resource,$row,$field='')
 	{
-		if(!empty($field))
-		{
-			return mysql_result($resource,$row,$field);
-		}
-		else
-		{
-			return mysql_result($resource,$row);
-		}
+	 	if (mysql_num_rows($resource) > 0) {
+			if(!empty($field))
+			{
+				return mysql_result($resource,$row,$field);
+			}
+			else
+			{
+				return mysql_result($resource,$row);
+			}
+	 	}
 	}
 	/**
 	 * Recovers the last ID of any insert query executed over this SQL connection