Browse Source

More json_encode migration

I swear one of these days I'll just do a search and replace all of them
spaghetti 8 years ago
parent
commit
788a4da9c0
3 changed files with 6 additions and 4 deletions
  1. 1
    1
      classes/paranoia.class.php
  2. 4
    2
      classes/users.class.php
  3. 1
    1
      sections/user/user.php

+ 1
- 1
classes/paranoia.class.php View File

51
     return false;
51
     return false;
52
   }
52
   }
53
   if (!is_array($Paranoia)) {
53
   if (!is_array($Paranoia)) {
54
-    $Paranoia = unserialize($Paranoia);
54
+    $Paranoia = json_decode($Paranoia, true);
55
   }
55
   }
56
   if (!is_array($Paranoia)) {
56
   if (!is_array($Paranoia)) {
57
     $Paranoia = array();
57
     $Paranoia = array();

+ 4
- 2
classes/users.class.php View File

95
       } else {
95
       } else {
96
         $UserInfo = G::$DB->next_record(MYSQLI_ASSOC, array('Paranoia', 'Title'));
96
         $UserInfo = G::$DB->next_record(MYSQLI_ASSOC, array('Paranoia', 'Title'));
97
         $UserInfo['CatchupTime'] = strtotime($UserInfo['CatchupTime']);
97
         $UserInfo['CatchupTime'] = strtotime($UserInfo['CatchupTime']);
98
-        $UserInfo['Paranoia'] = json_decode($UserInfo['Paranoia'], true);
99
-        if ($UserInfo['Paranoia'] === false) {
98
+        if (!is_array($UserInfo['Paranoia'])) {
99
+          $UserInfo['Paranoia'] = json_decode($UserInfo['Paranoia'], true);
100
+        }
101
+        if (!$UserInfo['Paranoia']) {
100
           $UserInfo['Paranoia'] = array();
102
           $UserInfo['Paranoia'] = array();
101
         }
103
         }
102
         $UserInfo['Class'] = $Classes[$UserInfo['PermissionID']]['Level'];
104
         $UserInfo['Class'] = $Classes[$UserInfo['PermissionID']]['Level'];

+ 1
- 1
sections/user/user.php View File

164
     $Paranoia = $CustomParanoia;
164
     $Paranoia = $CustomParanoia;
165
   }
165
   }
166
 } else {
166
 } else {
167
-  $Paranoia = unserialize($Paranoia);
167
+  $Paranoia = json_decode($Paranoia, true);
168
   if (!is_array($Paranoia)) {
168
   if (!is_array($Paranoia)) {
169
     $Paranoia = array();
169
     $Paranoia = array();
170
   }
170
   }

Loading…
Cancel
Save