Changeset 2635:ad168cf3085a for plugins/pages/_public.php

Timestamp:

01/20/14 12:50:44 (12 years ago)

Author:

Dsls

Branch:

default

Parents:

2633:e926dcfd2a59 (diff), 2634:d60876d7e4e4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 2.6

Files:

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

plugins/pages/_public.php

@@ -68 +68 @@
                          # Get passwords cookie
                          if (isset($_COOKIE['dc_passwd'])) {
-                              $pwd_cookie = unserialize($_COOKIE['dc_passwd']);
+                              $pwd_cookie = json_decode($_COOKIE['dc_passwd']);
+                              if ($pwd_cookie === NULL) {
+                                   $pwd_cookie = array();
+                              } else {
+                                   $pwd_cookie = (array) $pwd_cookie;
+                              }
                          } else {
                               $pwd_cookie = array();
@@ -78 +83 @@
                          {
                               $pwd_cookie[$post_id] = $post_password;
-                              setcookie('dc_passwd',serialize($pwd_cookie),0,'/');
+                              setcookie('dc_passwd',json_encode($pwd_cookie),0,'/');
                          }
                          else

plugins/pages/_public.php

@@ -117 +117 @@
                          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();
-                              }
-                              $content = $core->wikiTransform($content);
+                                   if ($core->blog->settings->system->wiki_comments) {
+                                        $core->initWikiComment();
+                                   } else {
+                                        $core->initWikiSimpleComment();
+                                   }
+                                   $content = $core->wikiTransform($content);
+                              }
                               $content = $core->HTMLfilter($content);
                          }
@@ -189 +195 @@
                          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');
                }