Merge remote-tracking branch 'origin/2.1' into 2.1

LimeSurvey · Nov 21, 2012 · 0c8fc79 · 0c8fc79
2 parents 403d515 + ed01b49
commit 0c8fc79
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/application/config/config-sample-mysql.php b/application/config/config-sample-mysql.php
@@ -61,9 +61,10 @@
             // then please check your error-logs - either in your hosting provider admin panel or in some /logs directory
             // on your webspace.
             // LimeSurvey developers: Set this to 2 to additionally display STRICT PHP error messages and get full access to standard templates
-            'debug'=>0
+            'debug'=>0,
+            'debugsql'=>0 // Set this to 1 to enanble sql logging, only active when debug = 2
         )
     )
 );
 /* End of file config.php */
-/* Location: ./application/config/config.php */
+/* Location: ./application/config/config.php */
diff --git a/application/config/config-sample-pgsql.php b/application/config/config-sample-pgsql.php
@@ -64,8 +64,9 @@
 	// then please check your error-logs - either in your hosting provider admin panel or in some /logs directory
 	// on your webspace.
 	// LimeSurvey developers: Set this to 2 to additionally display STRICT PHP error messages and get full access to standard templates
-		'debug'=>0
+		'debug'=>0,
+		'debugsql'=>0 // Set this to 1 to enanble sql logging, only active when debug = 2
 	)
 );
 /* End of file config.php */
-/* Location: ./application/config/config.php */
+/* Location: ./application/config/config.php */
diff --git a/application/config/config-sample-sqlsrv.php b/application/config/config-sample-sqlsrv.php
@@ -64,8 +64,9 @@
     // then please check your error-logs - either in your hosting provider admin panel or in some /logs directory
     // on your webspace.
     // LimeSurvey developers: Set this to 2 to additionally display STRICT PHP error messages and get full access to standard templates
-        'debug'=>0
+        'debug'=>0,
+        'debugsql'=>0 // Set this to 1 to enanble sql logging, only active when debug = 2
     )
 );
 /* End of file config.php */
-/* Location: ./application/config/config.php */
+/* Location: ./application/config/config.php */
diff --git a/application/modules/NumericalQuestion.php b/application/modules/NumericalQuestion.php
@@ -95,6 +95,17 @@ public function getDataEntry($idrow, &$fnames, $language)
         ."onkeypress=\"return goodchars(event,'0123456789.,')\" />\n";
     }
 
+    public function getExtendedAnswer($value, $language)
+    {
+        echo Yii::trace(CVarDumper::dumpAsString($value),'vardump');
+        $value=rtrim($value,"0.");
+        $aQuestionAttributes = $this->getAttributeValues();
+        if($aQuestionAttributes['num_value_int_only'])
+        {
+            $sValue=number_format($sValue, 0, '', '');
+        }
+    }
+
     public function filter($value, $type)
     {
         if (trim($value)=="")
@@ -276,4 +287,4 @@ public function questionProperties($prop = false)
         return $prop?$props[$prop]:$props;
     }
 }
-?>
+?>