mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-25 15:31:41 +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;
}