From 8332ce69e3d14dc6d62b9a8a10c56e2e8f14601d Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Wed, 29 Aug 2012 09:57:16 +0000
Subject: [PATCH] issue 2272 getLayoutRowData method modify

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11115 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/layout/layout.admin.controller.php | 3 ++-
 modules/layout/layout.model.php            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index f20319bd6..6d4ef6637 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -630,7 +630,8 @@
 			$oLayoutModel = &getModel('layout');
 			$layout = $oLayoutModel->getLayout($sourceArgs->layout_srl);
 
-			$args->extra_vars = $oLayoutModel->getLayoutRawData($sourceArgs->layout_srl, array('extra_vars'));
+			$output = $oLayoutModel->getLayoutRawData($sourceArgs->layout_srl, array('extra_vars'));
+			$args->extra_vars = $output->extra_vars;
 			$extra_vars = unserialize($args->extra_vars);
 
 			$oModuleController = &getController('module');
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 6c112c6c5..bd44a99a0 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -104,7 +104,7 @@
 			if(!$output->toBool())
 				return;
 
-			return $output->data->extra_vars;
+			return $output->data;
 		}
 
         /**