Changeset 2650:aef6139b7445 for inc/public

Timestamp:

02/05/14 16:06:00 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

2613:014098e27ea0 (diff), 2648:87707433da37 (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 default

File:

• inc/public/lib.urlhandlers.php (modified) (2 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