From a42d288517844172c519beda6fd65db45132396f Mon Sep 17 00:00:00 2001
From: fredyrivera <fredyrivera@alien>
Date: Fri, 29 Sep 2017 16:33:44 -0500
Subject: [PATCH] correccion orden de areas

---
 milfs/funciones/funciones.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/milfs/funciones/funciones.php b/milfs/funciones/funciones.php
index d579ab5..c84f7e8 100644
--- a/milfs/funciones/funciones.php
+++ b/milfs/funciones/funciones.php
@@ -7360,11 +7360,8 @@ $control = md5(rand(1,99999999).microtime());
 		OR (form_contenido_campos.id_form = '$perfil' AND form_campos.campo_area ='0' )
 		AND form_areas.estado = '1' GROUP BY form_areas.id ORDER BY form_areas.orden";
 		*/
-		$consulta= "SELECT * FROM form_campos, `form_contenido_campos`
-		WHERE form_campos.id = form_contenido_campos.id_campo
-		AND form_contenido_campos.id_form = '$perfil'
+		$consulta= "SELECT * , form_areas.orden FROM form_campos, `form_contenido_campos`, form_areas WHERE form_campos.campo_area = form_areas.id AND form_campos.id = form_contenido_campos.id_campo AND form_contenido_campos.id_form = '$perfil' GROUP BY form_campos.campo_area ORDER BY form_areas.orden
 
-		GROUP BY form_campos.campo_area
 		";
 
 $link=Conectarse();
@@ -7404,7 +7401,7 @@ if (mysqli_num_rows($sql)!='0'){
 				<img class='img img-responsive' src='$_SESSION[url]/milfs/images/secure/?file=150/$logo[0]'>
 			</div>
 			<div class='col-md-9'>
-			<h2>$nombre<small style='display:block;'>$descripcion</small></h2>
+			<h2>$nombre<small style='display:block;'>$descripcion </small></h2>
 			</div>
 		</div>
 	</div>";
@@ -8336,7 +8333,7 @@ return $contenido;
 }
 
 
-function formulario_embebido($id){
+function formulario_embebido($id,$opciones){
 		$publico = remplacetas('form_id','id',"$id",'modificable',"") ;
 		$propietario = 	remplacetas('form_id','id',$id,'propietario',"") ;
 		$empresa = 	remplacetas('form_id','id',$id,'id_empresa',"") ;