Changes in plugins/pages/_public.php [2566:9bf417837888:2607:2a4091ec08c4]

File:

• plugins/pages/_public.php (modified) (2 diffs)

plugins/pages/_public.php

@@ -112 +112 @@
                          if ($content != '')
                          {
-                              if ($core->blog->settings->system->wiki_comments) {
-                                   $core->initWikiComment();
+                              # --BEHAVIOR-- publicBeforeCommentTransform
+                              $buffer = $core->callBehavior('publicBeforeCommentTransform',$content);
+                              if ($buffer != '') {
+                                   $content = $buffer;
                               } else {
-                                   $core->initWikiSimpleComment();
+                                   if ($core->blog->settings->system->wiki_comments) {
+                                        $core->initWikiComment();
+                                   } else {
+                                        $core->initWikiSimpleComment();
+                                   }
+                                   $content = $core->wikiTransform($content);
                               }
-                              $content = $core->wikiTransform($content);
                               $content = $core->HTMLfilter($content);
                          }
@@ -184 +190 @@
                          header('X-Pingback: '.$core->blog->url.$core->url->getURLFor("xmlrpc",$core->blog->id));
                     }
-                    $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates');
+
+                    $tplset = $core->themes->moduleInfo($core->blog->settings->system->theme,'tplset');
+                    if (!empty($tplset) && is_dir(dirname(__FILE__).'/default-templates/'.$tplset)) {
+                         $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates/'.$tplset);
+                    } else {
+                         $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates/'.DC_DEFAULT_TPLSET);
+                    }
                     self::serveDocument('page.html');
                }