Minor improvements (#266)

* Minor improvements * Update CHANGELOG.md
torrentpier · Sep 25, 2023 · 407ff51 · 407ff51
1 parent 2cd2fae
commit 407ff51
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)

diff --git a/admin/admin_attach_cp.php b/admin/admin_attach_cp.php
@@ -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'];
@@ -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>';
@@ -314,6 +313,7 @@
 		}
 	}
 
+	$s_categories = '';
 	if( $s_forums != '' )
 	{
 		$s_forums = '<option value="0">' . $lang['ALL_AVAILABLE'] . '</option>' . $s_forums;
@@ -532,7 +532,7 @@
 
 	if (!$search_based && !$user_based)
 	{
-		if ($total_attachments == 0)
+		if (!$attachments)
 		{
 			$sql = "SELECT attach_id FROM " . BB_ATTACHMENTS_DESC;
 

diff --git a/admin/admin_rebuild_search.php b/admin/admin_rebuild_search.php
@@ -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');
@@ -111,7 +111,7 @@
 		{
 			$time_limit = $max_execution_time;
 		}
-	}
+	}*/
 
 	// check for webserver timeout (IE returns null)
 	if ( isset($_SERVER["HTTP_KEEP_ALIVE"]) )
@@ -649,4 +649,4 @@ function create_percent_box($box, $percent_color, $percent_width)
 			'TOTAL_PERCENT_WIDTH' => round($percent_width),
 		));
 	}
-}
+}
diff --git a/library/includes/core/mysql.php b/library/includes/core/mysql.php
@@ -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 .= '