mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 01:54:12 +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

14
e107_handlers/pref_class.php
View File

@@ -205,7 +205,7 @@ class e_pref extends e_front_model
* @param mixed $value
* @return e_pref
*/
public function set($pref_name, $value)
public function set($pref_name, $value=null, $strict = false)
{
global $pref;
if(empty($pref_name) || !is_string($pref_name))
@@ -341,7 +341,7 @@ class e_pref extends e_front_model
* @param boolean $strict
* @return $this|\e_model
*/
final public function addData($pref_name, $value = null)
final public function addData($pref_name, $value = null, $override = true)
{
global $pref;
parent::addData($pref_name, $value, false);
@@ -361,7 +361,7 @@ class e_pref extends e_front_model
* @param mixed $value
* @return e_pref
*/
final public function setData($pref_name, $value = null)
final public function setData($pref_name, $value = null, $strict = false)
{
global $pref;
if(empty($pref_name))
@@ -393,7 +393,7 @@ class e_pref extends e_front_model
* @param string $pref_name
* @return e_pref
*/
final public function removeData($pref_name)
final public function removeData($pref_name=null)
{
global $pref;
parent::removeData((string) $pref_name);
@@ -752,14 +752,14 @@ class e_pref extends e_front_model
/**
* Override
*/
public function delete()
public function delete($ids, $destroy = true, $session_messages = false)
{
}
/**
* Override
*/
protected function dbUpdate()
protected function dbUpdate($force = false, $session_messages = false)
{
}
}
@@ -983,7 +983,7 @@ class e_plugin_pref extends e_pref
* @see e107_handlers/e_pref#delete()
* @return boolean
*/
public function delete()
public function delete($ids, $destroy = true, $session_messages = false)
{
$ret = false;
if($this->plugin_id)