Changeset 2635:ad168cf3085a for inc/public

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:

• inc/public/lib.urlhandlers.php (modified) (2 diffs)
• inc/public/lib.urlhandlers.php (modified) (4 diffs)

inc/public/lib.urlhandlers.php

@@ -374 +374 @@
                          # 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();
@@ -384 +389 @@
                          {
                               $pwd_cookie[$post_id] = $post_password;
-                              setcookie('dc_passwd',serialize($pwd_cookie),0,'/');
+                              setcookie('dc_passwd',json_encode($pwd_cookie),0,'/');
                          }
                          else

inc/public/lib.urlhandlers.php

@@ -86 +86 @@
                $_ctx->nb_entry_per_page = $core->blog->settings->system->nb_post_per_page;
           }
+          if ($_ctx->nb_entry_first_page === null) {
+               $_ctx->nb_entry_first_page = $_ctx->nb_entry_per_page;
+          }
 
           $tpl_file = $core->tpl->getFilePath($tpl);
@@ -188 +191 @@
           else
           {
+               $_ctx =& $GLOBALS['_ctx'];
                $core =& $GLOBALS['core'];
 
@@ -196 +200 @@
 
                if (empty($_GET['q'])) {
+                    if ($core->blog->settings->system->nb_post_for_home !== null) {
+                         $_ctx->nb_entry_first_page = $core->blog->settings->system->nb_post_for_home;
+                    }
                     self::serveDocument('home.html');
                     $core->blog->publishScheduledEntries();
@@ -416 +423 @@
                          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);
                          }