Completed
Pull Request — develop (#118)
by Patrick
05:03 queued 02:38
created
Auth/class.User.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -311,7 +311,7 @@
 block discarded – undo
311 311
      *
312 312
      * @param stdClass $data The user's new data
313 313
      *
314
-     * @return boolean true if the user's data was changed, false otherwise
314
+     * @return boolean|null true if the user's data was changed, false otherwise
315 315
      */
316 316
     public function editUser($data)
317 317
     {
Please login to merge, or discard this patch.
Auth/class.LDAPGettableObject.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -35,20 +35,20 @@
 block discarded – undo
35 35
     {
36 36
         if(isset($this->labeleduri))
37 37
         {
38
-             //Have multiple emails
39
-             if($propName === 'mail')
40
-             {
41
-                 return $this->getFieldSingleValue('labeleduri');
42
-             }
43
-             if($propName === 'allMail')
44
-             {
45
-                 $tmp = $this->getField('mail');
46
-                 if(isset($tmp['count']))
47
-                 {
48
-                     unset($tmp['count']);
49
-                 }
50
-                 return $tmp;
51
-             }
38
+                //Have multiple emails
39
+                if($propName === 'mail')
40
+                {
41
+                    return $this->getFieldSingleValue('labeleduri');
42
+                }
43
+                if($propName === 'allMail')
44
+                {
45
+                    $tmp = $this->getField('mail');
46
+                    if(isset($tmp['count']))
47
+                    {
48
+                        unset($tmp['count']);
49
+                    }
50
+                    return $tmp;
51
+                }
52 52
         }
53 53
         $tmp = $this->getValueWithDefault($propName);
54 54
         if($tmp !== false)
Please login to merge, or discard this patch.
Http/class.FlipAdminPage.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         $this->addLink('Home', '..');
50 50
         if($this->user === false || $this->user === null)
51 51
         {
52
-          $this->content['body'] = '
52
+            $this->content['body'] = '
53 53
             <div id="content">
54 54
               <div class="row">
55 55
                 <div class="col-lg-12">
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         }
62 62
         else if($this->isAdmin() === false)
63 63
         {
64
-          $this->content['body'] = '
64
+            $this->content['body'] = '
65 65
             <div id="content">
66 66
               <div class="row">
67 67
                 <div class="col-lg-12">
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
70 70
               </div>
71 71
             </div>
72 72
           ';
73
-          $this->content['header'] = array();
74
-          $this->content['cards'] = array();
73
+            $this->content['header'] = array();
74
+            $this->content['cards'] = array();
75 75
         }
76 76
         return parent::getContent();
77 77
     }
Please login to merge, or discard this patch.