summaryrefslogtreecommitdiffstats
path: root/modules/support/page.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2016-04-29 20:55:59 +0200
committerSimon Rettberg2016-04-29 20:55:59 +0200
commitcbd23b7d191327a7cfb6a98e657659045da71af3 (patch)
treef029ab85c3ac07d3f2a56b4359fd36c265898d6d /modules/support/page.inc.php
parentMore Progress; Merged changes from ufpr up to 775cdbd29f5d0f70946d1d5ff09c091... (diff)
downloadslx-admin-cbd23b7d191327a7cfb6a98e657659045da71af3.tar.gz
slx-admin-cbd23b7d191327a7cfb6a98e657659045da71af3.tar.xz
slx-admin-cbd23b7d191327a7cfb6a98e657659045da71af3.zip
Second half of merge....
Diffstat (limited to 'modules/support/page.inc.php')
-rw-r--r--modules/support/page.inc.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/modules/support/page.inc.php b/modules/support/page.inc.php
index d4012c1a..10695969 100644
--- a/modules/support/page.inc.php
+++ b/modules/support/page.inc.php
@@ -65,10 +65,16 @@ class Page_Support extends Page
protected function doRender(){
error_reporting(E_ALL);
ini_set('display_errors','on');
- if (strpos($_SERVER['REQUEST_URI'], "true") !== false)
- Render::addTemplate('page-faq');
- else
- Render::addTemplate('page-support');
+ if (strpos($_SERVER['REQUEST_URI'], "true") !== false){
+ Render::addTemplate('page-faq',
+ json_decode(file_get_contents("modules/support/faq.json"),true)
+ );
+ }
+ else{
+ Render::addTemplate('page-support',
+ json_decode(file_get_contents("modules/support/faq.json"),true)
+ );
+ }
// Render::addTemplate('page-support', array(
// 'token' => Session:get('token'));
}