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 #2146 PHP 7.3 class compatibility fix. More testing required.

Browse Source
This commit is contained in:
Cameron
2019-06-03 16:29:38 -07:00
parent ce7f3feb38
commit 62863b4934
9 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/image.php
View File

@@ -1229,7 +1229,7 @@ class media_admin_ui extends e_admin_ui
$this->setFileListMode($cat);
}
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, 0, false, $this->listQry))->load();
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, 0, false, $this->listQry))->loadBatch();
}
@@ -1760,7 +1760,7 @@ class media_admin_ui extends e_admin_ui
if($type == 'file')
{
$this->perPage = 0;
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->load();
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->loadBatch();
$text = $this->getUI()->getList();
}
else
@@ -1926,7 +1926,7 @@ class media_admin_ui extends e_admin_ui
private function fileTab($cat='', $parm=array())
{
$this->perPage = 0;
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->load();
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->loadBatch();
$this->setFileListMode($cat);
$text = $this->getUI()->getList();

3
e107_admin/links.php
View File

@@ -482,8 +482,9 @@ class links_admin_ui extends e_admin_ui
{
if($this->getAction() != 'list')
{
$this->getTreeModel()->setParam('order', 'ORDER BY '.$this->listOrder)->load();
$this->getTreeModel()->setParam('order', 'ORDER BY '.$this->listOrder)->loadBatch();
}
/** @var e_tree_modell $tree */
$tree = $this->getTreeModel()->getTree();
$this->_link_array = array();
foreach ($tree as $id => $model)

4
e107_admin/plugin.php
View File

@@ -276,7 +276,7 @@ class plugin_ui extends e_admin_ui
public function ListAjaxObserver()
{
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, 0, false, $this->listQry))->load();
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, 0, false, $this->listQry))->loadBatch();
$this->setPlugData();
}
@@ -1976,7 +1976,7 @@ class pluginLanguage extends e_admin_ui
// continue;
}
if(empty($row) || $skip == true || substr($row,0,5) == '<?php' || substr($row,0,2) == '?>' || substr($row,0,2)=='//')
if(empty($row) /*|| $skip == true*/ || substr($row,0,5) == '<?php' || substr($row,0,2) == '?>' || substr($row,0,2)=='//')
{
continue;
}

2
e107_admin/theme.php
View File

@@ -312,7 +312,7 @@ class theme_admin_ui extends e_admin_ui
$param['limitTo'] = 0 ; // (int) $this->getPerPage();
$param['searchqry'] = $this->getQuery('searchquery', '');
$this->getTreeModel()->setParams($param)->load(); // load the tree model above from the class below.
$this->getTreeModel()->setParams($param)->loadBatch(); // load the tree model above from the class below.
}
public function OnlineObserver()

10
e107_admin/users.php
View File

@@ -612,7 +612,7 @@ class users_admin_ui extends e_admin_ui
e107::getMessage()->addSuccess("(".$sysuser->getId().".".$sysuser->getName()." - ".$sysuser->getValue('email').") ".USRLAN_9);
// List data reload
$this->getTreeModel()->load(true);
$this->getTreeModel()->loadBatch(true);
}
/**
@@ -676,7 +676,7 @@ class users_admin_ui extends e_admin_ui
}
// List data reload
$this->getTreeModel()->load(true);
$this->getTreeModel()->loadBatch(true);
}
/**
@@ -724,7 +724,7 @@ class users_admin_ui extends e_admin_ui
$mes->addSuccess(USRLAN_86." (#".$sysuser->getId()." : ".$sysuser->getName().' - '.$sysuser->getValue('email').")");
$this->getTreeModel()->load(true);
$this->getTreeModel()->loadBatch(true);
if ((int) e107::pref('core', 'user_reg_veri') == 2)
{
@@ -866,7 +866,7 @@ class users_admin_ui extends e_admin_ui
e107::getAdminLog()->log_event('USET_09',$tp->lanVars(USRLAN_165, $vars), E_LOG_INFORMATIVE);
$mes->addSuccess($sysuser->getName()." (".$sysuser->getValue('email').") ".USRLAN_6);
$this->getTreeModel()->load(true);
$this->getTreeModel()->loadBatch(true);
}
else
{
@@ -1363,7 +1363,7 @@ class users_admin_ui extends e_admin_ui
//FIXME admin log
// Reload tree
$this->getTreeModel()->load(true);
$this->getTreeModel()->loadBatch(true);
return;
}

10
e107_handlers/admin_ui.php
View File

@@ -5315,7 +5315,7 @@ class e_admin_ui extends e_admin_controller_ui
$caption = e107::getParser()->lanVars(LAN_UI_BATCH_REVERSED_SUCCESS, $cnt, true);
$tree->addMessageSuccess($caption);
//sync models
$tree->load(true);
$tree->loadBatch(true);
}
$this->getTreeModel()->setMessages();
}
@@ -5487,7 +5487,7 @@ class e_admin_ui extends e_admin_controller_ui
$msg = e107::getParser()->lanVars(LAN_UI_BATCH_UPDATE_SUCCESS, array('x' => $vttl, 'y' => $cnt), true);
$this->getTreeModel()->addMessageSuccess($msg);
// force reload the collection from DB, fix some issues as 'observer' is executed before the batch handler
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->load(true);
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->loadBatch(true);
}
$this->getTreeModel()->setMessages();
return $cnt;
@@ -5608,7 +5608,7 @@ class e_admin_ui extends e_admin_controller_ui
{
return;
}
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->load();
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->loadBatch();
$this->addTitle();
@@ -5631,7 +5631,7 @@ class e_admin_ui extends e_admin_controller_ui
{
return;
}
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->load();
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->loadBatch();
}
/**
@@ -5888,7 +5888,7 @@ class e_admin_ui extends e_admin_controller_ui
*/
public function ListAjaxObserver()
{
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, 0, false, $this->listQry))->load();
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, 0, false, $this->listQry))->loadBatch();
}

6
e107_handlers/model_class.php
View File

@@ -1738,7 +1738,7 @@ class e_model extends e_object
* - clearModelCache: e_tree_model class/subclasses - clear cache per node after successful DB operation
* - noCacheStringModify: e_tree_model class/subclasses - do not add additional md5 sum to tree cache string
* @param array $params
* @return e_model
* @return e_model|e_tree_model
*/
public function setParams(array $params)
{
@@ -3194,7 +3194,7 @@ class e_tree_model extends e_front_model
/**
* Set table name
* @param object $table
* @param string $table
* @return e_tree_model
*/
public function setModelTable($table)
@@ -3328,7 +3328,7 @@ class e_tree_model extends e_front_model
*
* @return e_tree_model
*/
public function load($force = false)
public function loadBatch($force = false)
{
if ($force)
{

12
e107_handlers/news_class.php
View File

@@ -744,7 +744,7 @@ class e_news_tree extends e_front_tree_model
* @param mixed $category_id
* @param boolean $force
* @param array $params DB query parameters
* @return e_news_tree
* @return e_news_tree|e_tree_model
*/
public function loadJoin($category_id = 0, $force = false, $params = array())
{
@@ -785,7 +785,7 @@ class e_news_tree extends e_front_tree_model
$this->setParam('db_query', $query);
return parent::load($force);
return parent::loadBatch($force);
}
/**
@@ -1025,9 +1025,9 @@ class e_news_category_tree extends e_front_tree_model
* Load category data from the DB
*
* @param boolean $force
* @return e_news_category_tree
* @return e_tree_model
*/
public function load($force = false)
public function loadBatch($force = false)
{
$this->setParam('model_class', 'e_news_category_item')
->setParam('nocount', true)
@@ -1036,7 +1036,7 @@ class e_news_category_tree extends e_front_tree_model
->setCacheString('news_category_tree')
->setModelTable('news_category');
return parent::load($force);
return parent::loadBatch($force);
}
/**
@@ -1070,7 +1070,7 @@ class e_news_category_tree extends e_front_tree_model
$this->setModelTable('news_category');
return parent::load($force);
return parent::loadBatch($force);
}
/**

6
e107_handlers/user_model.php
View File

@@ -2668,7 +2668,7 @@ class e_user_extended_structure_tree extends e_tree_model
*/
public function __construct()
{
$this->load();
$this->loadBatch();
}
/**
@@ -2738,12 +2738,12 @@ class e_user_extended_structure_tree extends e_tree_model
*
* @param boolean $force
*/
public function load($force = false)
public function loadBatch($force = false)
{
$this->setParam('nocount', true)
->setParam('model_class', 'e_user_extended_structure_model')
->setParam('db_order', 'user_extended_struct_order ASC');
parent::load($force);
parent::loadBatch($force);
return $this;
}