mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Issue #1287 - PHP7 and SSL fixes.

Browse Source
This commit is contained in:
Cameron
2016-02-14 19:00:12 -08:00
parent 303195d81e
commit 4e8412b16c
12 changed files with 73 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/user_model.php
View File

@@ -906,7 +906,7 @@ class e_user_model extends e_admin_model
* data to user model
* @return e_user_model
*/
public function mergePostedData()
public function mergePostedData($strict = true, $sanitize = true, $validate = true)
{
$posted = $this->getPostedData();
foreach ($posted as $key => $value)
@@ -2383,7 +2383,7 @@ class e_user_extended_model extends e_admin_model
* data to user extended model
* @return e_user_extended_model
*/
public function mergePostedData()
public function mergePostedData($strict = true, $sanitize = true, $validate = true)
{
$posted = $this->getPostedData();
foreach ($posted as $key => $value)
@@ -2493,7 +2493,7 @@ class e_user_extended_structure_model extends e_model
/**
* Loading of single structure row not allowed for front model
*/
public function load()
public function load($id = null, $force = false)
{
return $this;
}
@@ -2732,7 +2732,7 @@ class e_user_pref extends e_front_model
* @param boolean $force
* @return boolean success
*/
public function save($from_post = false, $force = false)
public function save($from_post = false, $force = false, $session_messages = false)
{
if($this->_user->getId())
{