mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-17 23:21:33 +02:00
fix r9605
Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9606 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
phpBB
@@ -114,7 +114,7 @@
|
|||||||
<li>[Fix] Display user's Jabber address in popup when Jabber functionality is disabled (Bug #20775 - Patch by nickvergessen)</li>
|
<li>[Fix] Display user's Jabber address in popup when Jabber functionality is disabled (Bug #20775 - Patch by nickvergessen)</li>
|
||||||
<li>[Fix] Exclude forum from active topics option is ignored (Bug #19135 - Patch by nickvergessen)</li>
|
<li>[Fix] Exclude forum from active topics option is ignored (Bug #19135 - Patch by nickvergessen)</li>
|
||||||
<li>[Fix] Do not display birthdays of banned users (Bug #20625 - Patch by nickvergessen)</li>
|
<li>[Fix] Do not display birthdays of banned users (Bug #20625 - Patch by nickvergessen)</li>
|
||||||
<li>[Fix] Fix function to recalculate Binary Tree (Bug #41555 - Patch by EXreaction)</li>
|
<li>[Fix] Fix function to recalculate Nested Sets (Bug #41555 - Patch by EXreaction)</li>
|
||||||
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
|
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
|
||||||
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
|
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
|
||||||
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
|
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
|
||||||
|
@@ -17,17 +17,17 @@ if (!defined('IN_PHPBB'))
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recalculate Binary Tree
|
* Recalculate Nested Sets
|
||||||
*
|
*
|
||||||
* @param int $new_id first left_id (should start with 1)
|
* @param int $new_id first left_id (should start with 1)
|
||||||
* @param string $pkey primary key-column (containing the id for the parent_id of the children)
|
* @param string $pkey primary key-column (containing the id for the parent_id of the children)
|
||||||
* @param string $table constant or fullname of the table
|
* @param string $table constant or fullname of the table
|
||||||
* @param int $parent_id parent_id of the current tree-path (default = 0)
|
* @param int $parent_id parent_id of the current set (default = 0)
|
||||||
* @param array $where contains strings to compare closer on the where statement (additional)
|
* @param array $where contains strings to compare closer on the where statement (additional)
|
||||||
*
|
*
|
||||||
* @author EXreaction
|
* @author EXreaction
|
||||||
*/
|
*/
|
||||||
function recalc_btree(&$new_id, $pkey, $table, $parent_id = 0, $where = array())
|
function recalc_nested_sets(&$new_id, $pkey, $table, $parent_id = 0, $where = array())
|
||||||
{
|
{
|
||||||
global $db;
|
global $db;
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ function recalc_btree(&$new_id, $pkey, $table, $parent_id = 0, $where = array())
|
|||||||
$new_id++;
|
$new_id++;
|
||||||
|
|
||||||
// Then we go through any children and update their left/right id's
|
// Then we go through any children and update their left/right id's
|
||||||
recalc_btree($new_id, $pkey, $table, $row[$pkey], $where);
|
recalc_nested_sets($new_id, $pkey, $table, $row[$pkey], $where);
|
||||||
|
|
||||||
// Then we come back and update the right_id for this module
|
// Then we come back and update the right_id for this module
|
||||||
if ($row['right_id'] != $new_id)
|
if ($row['right_id'] != $new_id)
|
||||||
|
Reference in New Issue
Block a user