Fixed warning if a second language is added to an empy labelset.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2839 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · May 2, 2007 · f0ef309 · f0ef309
1 parent 9ee8cbb
commit f0ef309
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/admin/labels.php b/admin/labels.php
@@ -466,12 +466,15 @@ function updateset($lid)
 	$result=db_execute_assoc($query);
 	if ($result) { while ($row=$result->FetchRow()) {$oldcodesarray[$row['code']]=$row['sortorder'];} }
 	$sqlvalues='';
-	foreach ($addlangidsarray as $addedlangid)
+	if (count($oldcodesarray) > 0 )
 	{
-		foreach ($oldcodesarray as $oldcode => $oldsortorder)
+		foreach ($addlangidsarray as $addedlangid)
 		{
-			$sqlvalues .= ", ($lid, '$oldcode', '$oldsortorder', '$addedlangid')";
-		}	
+			foreach ($oldcodesarray as $oldcode => $oldsortorder)
+			{
+				$sqlvalues .= ", ($lid, '$oldcode', '$oldsortorder', '$addedlangid')";
+			}
+		}
 	}	
 	if ($sqlvalues)
 	{

diff --git a/admin/statistics.php b/admin/statistics.php
@@ -719,7 +719,7 @@ function show(element) {
 	$prb->frame['top'] = 	80;	// Frame position from top
 	$prb->addLabel('text','txt1','Please wait ...');	// add Text as Label 'txt1' and value 'Please wait'
 	$prb->addLabel('percent','pct1');	// add Percent as Label 'pct1'
-	$prb->addButton('btn1','Go Back','?action=statistics&sid='.$sid);	// add Button as Label 'btn1' and action '?restart=1'
+	$prb->addButton('btn1','Go Back','?action=statistics&sid='.$surveyid);	// add Button as Label 'btn1' and action '?restart=1'
 
 	$process_status = 35;