Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor improvements #266

Merged
merged 2 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- Added missing translation in admin_ug_auth [\#254](https://github.com/torrentpier/torrentpier-lts/pull/254) ([belomaxorka](https://github.com/belomaxorka))
- Support for IDN domains [\#252](https://github.com/torrentpier/torrentpier-lts/pull/252) ([belomaxorka](https://github.com/belomaxorka), [kovalensky](https://github.com/kovalensky))
- Fixed cache directory auto-creating with SQLite [\#247](https://github.com/torrentpier/torrentpier-lts/pull/247) ([belomaxorka](https://github.com/belomaxorka))
- Minor improvements [\#245](https://github.com/torrentpier/torrentpier-lts/pull/245), [\#246](https://github.com/torrentpier/torrentpier-lts/pull/246), [\#248](https://github.com/torrentpier/torrentpier-lts/pull/248), [\#249](https://github.com/torrentpier/torrentpier-lts/pull/249), [\#250](https://github.com/torrentpier/torrentpier-lts/pull/250), [\#251](https://github.com/torrentpier/torrentpier-lts/pull/251), [\#253](https://github.com/torrentpier/torrentpier-lts/pull/253), [\#255](https://github.com/torrentpier/torrentpier-lts/pull/255), [\#256](https://github.com/torrentpier/torrentpier-lts/pull/256), [\#257](https://github.com/torrentpier/torrentpier-lts/pull/257), [\#258](https://github.com/torrentpier/torrentpier-lts/pull/258), [\#259](https://github.com/torrentpier/torrentpier-lts/pull/259), [\#261](https://github.com/torrentpier/torrentpier-lts/pull/261), [\#262](https://github.com/torrentpier/torrentpier-lts/pull/262), [\#263](https://github.com/torrentpier/torrentpier-lts/pull/263), [\#264](https://github.com/torrentpier/torrentpier-lts/pull/264), [\#265](https://github.com/torrentpier/torrentpier-lts/pull/265) ([belomaxorka](https://github.com/belomaxorka))
- Minor improvements [\#245](https://github.com/torrentpier/torrentpier-lts/pull/245), [\#246](https://github.com/torrentpier/torrentpier-lts/pull/246), [\#248](https://github.com/torrentpier/torrentpier-lts/pull/248), [\#249](https://github.com/torrentpier/torrentpier-lts/pull/249), [\#250](https://github.com/torrentpier/torrentpier-lts/pull/250), [\#251](https://github.com/torrentpier/torrentpier-lts/pull/251), [\#253](https://github.com/torrentpier/torrentpier-lts/pull/253), [\#255](https://github.com/torrentpier/torrentpier-lts/pull/255), [\#256](https://github.com/torrentpier/torrentpier-lts/pull/256), [\#257](https://github.com/torrentpier/torrentpier-lts/pull/257), [\#258](https://github.com/torrentpier/torrentpier-lts/pull/258), [\#259](https://github.com/torrentpier/torrentpier-lts/pull/259), [\#261](https://github.com/torrentpier/torrentpier-lts/pull/261), [\#262](https://github.com/torrentpier/torrentpier-lts/pull/262), [\#263](https://github.com/torrentpier/torrentpier-lts/pull/263), [\#264](https://github.com/torrentpier/torrentpier-lts/pull/264), [\#265](https://github.com/torrentpier/torrentpier-lts/pull/265), [\#266](https://github.com/torrentpier/torrentpier-lts/pull/266) ([belomaxorka](https://github.com/belomaxorka))

## [v2.1.5-2023.08-HotFix](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.08-HotFix) (2023-09-17)
[Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08...v2.1.5-2023.08-HotFix)
Expand Down
6 changes: 3 additions & 3 deletions admin/admin_attach_cp.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
}
require('./pagestart.php');

$total_attachments = 0;

if (($attach_config['upload_dir'][0] == '/') || (($attach_config['upload_dir'][0] != '/') && ($attach_config['upload_dir'][1] == ':')))
{
$upload_dir = $attach_config['upload_dir'];
Expand Down Expand Up @@ -304,6 +302,7 @@
}

$s_forums = '';
$list_cat = [];
while ($row = DB()->sql_fetchrow($result))
{ //sf
$s_forums .= '<option value="' . $row['forum_id'] . '">' . (($row['forum_parent']) ? HTML_SF_SPACER : '') . htmlCHR($row['forum_name']) . '</option>';
Expand All @@ -314,6 +313,7 @@
}
}

$s_categories = '';
if( $s_forums != '' )
{
$s_forums = '<option value="0">' . $lang['ALL_AVAILABLE'] . '</option>' . $s_forums;
Expand Down Expand Up @@ -532,7 +532,7 @@

if (!$search_based && !$user_based)
{
if ($total_attachments == 0)
if (!$attachments)
{
$sql = "SELECT attach_id FROM " . BB_ATTACHMENTS_DESC;

Expand Down
6 changes: 3 additions & 3 deletions admin/admin_rebuild_search.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
$time_limit_explain = $lang['TIME_LIMIT_EXPLAIN'];

// check for safe mode timeout
if ( ini_get('safe_mode') )
/*if ( ini_get('safe_mode') )
{
// get execution time
$max_execution_time = ini_get('max_execution_time');
Expand All @@ -111,7 +111,7 @@
{
$time_limit = $max_execution_time;
}
}
}*/

// check for webserver timeout (IE returns null)
if ( isset($_SERVER["HTTP_KEEP_ALIVE"]) )
Expand Down Expand Up @@ -649,4 +649,4 @@ function create_percent_box($box, $percent_color, $percent_width)
'TOTAL_PERCENT_WIDTH' => round($percent_width),
));
}
}
}
2 changes: 1 addition & 1 deletion library/includes/core/mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ function explain ($mode, $html_table = '', $row = '')
if (!$this->explain_hold) break;

$id = $this->dbg_id-1;
$htid = 'expl-'. intval($this->link) .'-'. $id;
$htid = 'expl-'. spl_object_hash($this->link) .'-'. $id;
$dbg = $this->dbg[$id];

$this->explain_out .= '
Expand Down