Browse Source

! theme_copyright doesn't need any more

emanuele 13 years ago
parent
commit
0deef635cf
1 changed files with 4 additions and 21 deletions
  1. 4 21
      Sources/Subs.php

+ 4 - 21
Sources/Subs.php

@@ -501,7 +501,7 @@ function updateSettings($changeArray, $update = false, $debug = false)
  */
 function constructPageIndex($base_url, &$start, $max_value, $num_per_page, $flexible_start = false)
 {
-	global $modSettings, $context;
+	global $modSettings;
 
 	// Save whether $start was less than 0 or not.
 	$start = (int) $start;
@@ -517,8 +517,6 @@ function constructPageIndex($base_url, &$start, $max_value, $num_per_page, $flex
 	else
 		$start = max(0, (int) $start - ((int) $start % (int) $num_per_page));
 
-	$context['current_page'] = $start / $num_per_page;
-
 	// Wireless will need the protocol on the URL somewhere.
 	if (WIRELESS)
 		$base_url .= ';' . WIRELESS_PROTOCOL;
@@ -2610,7 +2608,7 @@ function obExit($header = null, $do_footer = null, $from_index = false, $from_fa
 	{
 		// Was the page title set last minute? Also update the HTML safe one.
 		if (!empty($context['page_title']) && empty($context['page_title_html_safe']))
-			$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+			$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title']));
 
 		// Start up the session URL fixer.
 		ob_start('ob_sessrewrite');
@@ -2967,7 +2965,7 @@ function setupThemeContext($forceload = false)
 		$context['page_title'] = '';
 
 	// Set some specific vars.
-	$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+	$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title']));
 	$context['meta_keywords'] = !empty($modSettings['meta_keywords']) ? $smcFunc['htmlspecialchars']($modSettings['meta_keywords']) : '';
 }
 
@@ -3022,20 +3020,6 @@ function template_header()
 				if (!file_exists($boarddir . '/' . $securityFile))
 					unset($securityFiles[$i]);
 			}
-			// We are already checking so many files...just few more doesn't make any difference! :P
-			if (!empty($modSettings['currentAttachmentUploadDir']))
-			{
-				if (!is_array($modSettings['attachmentUploadDir']))
-					$modSettings['attachmentUploadDir'] = @unserialize($modSettings['attachmentUploadDir']);
-				$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
-			}
-			else
-			{
-				$path = $modSettings['attachmentUploadDir'];
-				$id_folder_thumb = 1;
-			}
-			secureDirectory($path, true);
-			secureDirectory($cachedir);
 
 			if (!empty($securityFiles) || (!empty($modSettings['cache_enable']) && !is_writable($cachedir)))
 			{
@@ -3098,9 +3082,8 @@ function template_header()
 
 /**
  * Show the copyright.
- * @param bool $get_it = false
  */
-function theme_copyright($get_it = false)
+function theme_copyright()
 {
 	global $forum_copyright, $context, $boardurl, $forum_version, $txt, $modSettings;