Merge branch 'module_blog' into dev

2016-09-20 15:34:44 +02:00
parent 8bd30d0301 65e9ca1c32
commit bbffbd5616
64 changed files with 692 additions and 357 deletions
@@ -53,6 +53,9 @@ class ContentPage extends Controller
        // add one new "view" for page
        $page->view();

+        // decode module settings
+        $page->module_settings = json_decode($page->module_settings);
+
        // get handler
        $handler = new $page->module_handler;