Fixed issue #6886: Admin password re-set after language changed and u…

…sing Postgres
LimeSurvey · Nov 22, 2012 · eabff36 · eabff36
1 parent 18100d1
commit eabff36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/core/UserIdentity.php b/application/core/UserIdentity.php
@@ -35,7 +35,7 @@ public function authenticate($sOneTimePassword='')
             {
                 if (gettype($user->password)=='resource')
                 {
-                    $sStoredPassword=stream_get_contents($user->password);  // Postgres delivers bytea fields as streams :-o
+                    $sStoredPassword=stream_get_contents($user->password,-1,0);  // Postgres delivers bytea fields as streams :-o
                 }
                 else
                 {

diff --git a/application/models/User.php b/application/models/User.php
@@ -168,7 +168,7 @@ public function beforeSave()
          // Postgres delivers bytea fields as streams :-o - if this is not done it looks like Postgres saves something unexpected
         if (gettype($this->password)=='resource')
         {
-            $this->password=stream_get_contents($this->password); 
+            $this->password=stream_get_contents($this->password,-1,0); 
         }
 
         return parent::beforeSave();