Merge branch 'master' into 192_dev

LimeSurvey · Jun 6, 2012 · 7af984b · 7af984b
2 parents d2fcd32 + 32e3468
commit 7af984b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/classes/expressions/ExpressionManager.php b/classes/expressions/ExpressionManager.php
@@ -2011,6 +2011,16 @@ private function RDP_RunFunction($funcNameToken,$params)
                                         $result = NAN;
                                     }
                                     break;
+                                case 'mktime':
+                                    if (is_numeric($params[0]) && is_numeric($params[1]))
+                                    {
+                                        $result = $funcName(intval($params[0]),intval($params[1]));
+                                    }
+                                    else
+                                    {
+                                        $result = NAN;
+                                    }
+                                    break;
                                 default:
                                     $result = $funcName($params[0], $params[1]);
                                      break;

diff --git a/replacements.php b/replacements.php
@@ -621,7 +621,7 @@ function templatereplace($line, $replacements=array(), $anonymized=false, $quest
                 {
                     $gseq=$moveInfo['gseq']+1;
                 }
-                $_trackURL = htmlspecialchars($thissurvey['name'] . '-[' . $surveyid . ']/[' . $gseq . ']-' . $_groupname);
+                $_trackURL = htmlentities($thissurvey['name'] . '-[' . $surveyid . ']/[' . $gseq . ']-' . $_groupname, ENT_QUOTES);
                 $_googleAnalyticsJavaScript = <<<EOD
 <script type="text/javascript">
   var _gaq = _gaq || [];