mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

e_tree_model private methods are now protected

Browse Source 
Fixes: #3039
This commit is contained in:
Deltik 2018-02-15 13:45:40 -06:00
parent 2f62a522b7
commit a4b972cb9f
No known key found for this signature in database
GPG Key ID: 1167C5F9C9897637
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
e107_handlers/model_class.php
View File

@ -3394,7 +3394,7 @@ class e_tree_model extends e_front_model
* @param string $sort_parent The field name whose value is the parent ID * @param string $sort_parent The field name whose value is the parent ID
* @return array Multidimensional array with child nodes under the "_children" key * @return array Multidimensional array with child nodes under the "_children" key
*/ */
private static function arrayToTree($rows, $primary_field, $sort_parent) protected static function arrayToTree($rows, $primary_field, $sort_parent)
{ {
$nodes = array(); $nodes = array();
$root = array($primary_field => 0); $root = array($primary_field => 0);
@ -3416,7 +3416,7 @@ class e_tree_model extends e_front_model
* @param string $sort_parent The field name whose value is the parent ID * @param string $sort_parent The field name whose value is the parent ID
* @returns null * @returns null
*/ */
private static function moveRowsToTreeNodes(&$nodes, &$rows, $primary_field, $sort_parent) protected static function moveRowsToTreeNodes(&$nodes, &$rows, $primary_field, $sort_parent)
{ {
$node = &$nodes[0]; $node = &$nodes[0];
array_shift($nodes); array_shift($nodes);
@ -3443,7 +3443,7 @@ class e_tree_model extends e_front_model
* @param int $depth The depth that this level of recursion is entering * @param int $depth The depth that this level of recursion is entering
* @return array One-dimensional array in depth-first order with depth indicated by the "_depth" key * @return array One-dimensional array in depth-first order with depth indicated by the "_depth" key
*/ */
private static function flattenTree($tree, $sort_field = null, $sort_order = 1, $depth = 0) protected static function flattenTree($tree, $sort_field = null, $sort_order = 1, $depth = 0)
{ {
$flat = array(); $flat = array();
@ -3478,7 +3478,7 @@ class e_tree_model extends e_front_model
* 0 if $row1 is equal to $row2 * 0 if $row1 is equal to $row2
* 1 if $row1 is greater than $row2 * 1 if $row1 is greater than $row2
*/ */
private static function multiFieldCmp($row1, $row2, $sort_field, $sort_order = 1) protected static function multiFieldCmp($row1, $row2, $sort_field, $sort_order = 1)
{ {
if (is_array($sort_field)) if (is_array($sort_field))
$field = array_shift($sort_field); $field = array_shift($sort_field);
@ -3487,7 +3487,6 @@ class e_tree_model extends e_front_model
if ($cmp === 0 && count($sort_field) >= 1) if ($cmp === 0 && count($sort_field) >= 1)
return self::multiFieldCmp($row1, $row2, $sort_field, $sort_order); return self::multiFieldCmp($row1, $row2, $sort_field, $sort_order);
return $cmp; return $cmp;
} }
/** /**
@ -3498,7 +3497,7 @@ class e_tree_model extends e_front_model
* @param resource $sql SQL resource that executed a query * @param resource $sql SQL resource that executed a query
* @return int Number of results from the latest query * @return int Number of results from the latest query
*/ */
private function countResults($sql) protected function countResults($sql)
{ {
$this->_total = is_integer($sql->total_results) ? $sql->total_results : false; //requires SQL_CALC_FOUND_ROWS in query - see db handler $this->_total = is_integer($sql->total_results) ? $sql->total_results : false; //requires SQL_CALC_FOUND_ROWS in query - see db handler
if(false === $this->_total && $this->getModelTable() && !$this->getParam('nocount')) if(false === $this->_total && $this->getModelTable() && !$this->getParam('nocount'))
@ -3526,7 +3525,7 @@ class e_tree_model extends e_front_model
* *
* @returns null * @returns null
*/ */
private function prepareSimulatedPagination() protected function prepareSimulatedPagination()
{ {
$db_query = $this->getParam('db_query'); $db_query = $this->getParam('db_query');
$db_query = preg_replace_callback("/LIMIT ([\d]+)[ ]*(?:,|OFFSET){0,1}[ ]*([\d]*)/i", function($matches) $db_query = preg_replace_callback("/LIMIT ([\d]+)[ ]*(?:,|OFFSET){0,1}[ ]*([\d]*)/i", function($matches)
@ -3563,7 +3562,7 @@ class e_tree_model extends e_front_model
* *
* @returns null * @returns null
*/ */
private function prepareSimulatedCustomOrdering() protected function prepareSimulatedCustomOrdering()
{ {
$db_query = $this->getParam('db_query'); $db_query = $this->getParam('db_query');
$db_query = preg_replace_callback('/ORDER BY (?:.+\.)*[\.]*([A-Za-z0-9$_,]+)[ ]*(ASC|DESC)*/i', function($matches) $db_query = preg_replace_callback('/ORDER BY (?:.+\.)*[\.]*([A-Za-z0-9$_,]+)[ ]*(ASC|DESC)*/i', function($matches)