From fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sun, 07 Jun 2015 12:16:19 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/admin/index.php | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/interface/web/admin/index.php b/interface/web/admin/index.php
index 3691df1..7cbfddb 100644
--- a/interface/web/admin/index.php
+++ b/interface/web/admin/index.php
@@ -34,14 +34,14 @@
var $target = '';
function render() {
-
+
global $app;
-
+
$app->uses('tpl');
$app->tpl->newTemplate("form.tpl.htm");
- $app->tpl->setVar('error',$error);
- $app->tpl->setInclude('content_tpl','admin/templates/index.htm');
+ $app->tpl->setVar('error', $error);
+ $app->tpl->setInclude('content_tpl', 'admin/templates/index.htm');
return $app->tpl->grab();
/*
$filename = 'test.txt';
@@ -69,10 +69,11 @@
-
+
return 'dd';
*/
}
+
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1