Browse Source

Merge pull request #1162 from Arantor/release-2.1

More old stuff to go buh-bye
Arantor 11 năm trước cách đây
mục cha
commit
ac14545cfb
34 tập tin đã thay đổi với 1 bổ sung5 xóa
  1. 0 4
      Sources/Search.php
  2. BIN
      Themes/default/images/topic/hot_poll.png
  3. BIN
      Themes/default/images/topic/hot_poll_locked.png
  4. BIN
      Themes/default/images/topic/hot_poll_locked_sticky.png
  5. BIN
      Themes/default/images/topic/hot_poll_sticky.png
  6. BIN
      Themes/default/images/topic/hot_post.png
  7. BIN
      Themes/default/images/topic/hot_post_locked.png
  8. BIN
      Themes/default/images/topic/hot_post_locked_sticky.png
  9. BIN
      Themes/default/images/topic/hot_post_sticky.png
  10. BIN
      Themes/default/images/topic/my_hot_poll.png
  11. BIN
      Themes/default/images/topic/my_hot_poll_locked.png
  12. BIN
      Themes/default/images/topic/my_hot_poll_locked_sticky.png
  13. BIN
      Themes/default/images/topic/my_hot_poll_sticky.png
  14. BIN
      Themes/default/images/topic/my_hot_post.png
  15. BIN
      Themes/default/images/topic/my_hot_post_locked.png
  16. BIN
      Themes/default/images/topic/my_hot_post_locked_sticky.png
  17. BIN
      Themes/default/images/topic/my_hot_post_sticky.png
  18. BIN
      Themes/default/images/topic/my_veryhot_poll.png
  19. BIN
      Themes/default/images/topic/my_veryhot_poll_locked.png
  20. BIN
      Themes/default/images/topic/my_veryhot_poll_locked_sticky.png
  21. BIN
      Themes/default/images/topic/my_veryhot_poll_sticky.png
  22. BIN
      Themes/default/images/topic/my_veryhot_post.png
  23. BIN
      Themes/default/images/topic/my_veryhot_post_locked.png
  24. BIN
      Themes/default/images/topic/my_veryhot_post_locked_sticky.png
  25. BIN
      Themes/default/images/topic/my_veryhot_post_sticky.png
  26. BIN
      Themes/default/images/topic/veryhot_poll.png
  27. BIN
      Themes/default/images/topic/veryhot_poll_locked.png
  28. BIN
      Themes/default/images/topic/veryhot_poll_locked_sticky.png
  29. BIN
      Themes/default/images/topic/veryhot_poll_sticky.png
  30. BIN
      Themes/default/images/topic/veryhot_post.png
  31. BIN
      Themes/default/images/topic/veryhot_post_locked.png
  32. BIN
      Themes/default/images/topic/veryhot_post_locked_sticky.png
  33. BIN
      Themes/default/images/topic/veryhot_post_sticky.png
  34. 1 1
      Themes/default/languages/Help.english.php

+ 0 - 4
Sources/Search.php

@@ -2048,10 +2048,6 @@ function prepareSearchContext($reset = false)
 			'link' => '<a href="' . $scripturl . '#c' . $message['id_cat'] . '">' . $message['cat_name'] . '</a>'
 		)
 	));
-	determineTopicClass($output);
-
-	if ($output['posted_in'])
-		$output['class'] = 'my_' . $output['class'];
 
 	$body_highlighted = $message['body'];
 	$subject_highlighted = $message['subject'];

BIN
Themes/default/images/topic/hot_poll.png


BIN
Themes/default/images/topic/hot_poll_locked.png


BIN
Themes/default/images/topic/hot_poll_locked_sticky.png


BIN
Themes/default/images/topic/hot_poll_sticky.png


BIN
Themes/default/images/topic/hot_post.png


BIN
Themes/default/images/topic/hot_post_locked.png


BIN
Themes/default/images/topic/hot_post_locked_sticky.png


BIN
Themes/default/images/topic/hot_post_sticky.png


BIN
Themes/default/images/topic/my_hot_poll.png


BIN
Themes/default/images/topic/my_hot_poll_locked.png


BIN
Themes/default/images/topic/my_hot_poll_locked_sticky.png


BIN
Themes/default/images/topic/my_hot_poll_sticky.png


BIN
Themes/default/images/topic/my_hot_post.png


BIN
Themes/default/images/topic/my_hot_post_locked.png


BIN
Themes/default/images/topic/my_hot_post_locked_sticky.png


BIN
Themes/default/images/topic/my_hot_post_sticky.png


BIN
Themes/default/images/topic/my_veryhot_poll.png


BIN
Themes/default/images/topic/my_veryhot_poll_locked.png


BIN
Themes/default/images/topic/my_veryhot_poll_locked_sticky.png


BIN
Themes/default/images/topic/my_veryhot_poll_sticky.png


BIN
Themes/default/images/topic/my_veryhot_post.png


BIN
Themes/default/images/topic/my_veryhot_post_locked.png


BIN
Themes/default/images/topic/my_veryhot_post_locked_sticky.png


BIN
Themes/default/images/topic/my_veryhot_post_sticky.png


BIN
Themes/default/images/topic/veryhot_poll.png


BIN
Themes/default/images/topic/veryhot_poll_locked.png


BIN
Themes/default/images/topic/veryhot_poll_locked_sticky.png


BIN
Themes/default/images/topic/veryhot_poll_sticky.png


BIN
Themes/default/images/topic/veryhot_post.png


BIN
Themes/default/images/topic/veryhot_post_locked.png


BIN
Themes/default/images/topic/veryhot_post_locked_sticky.png


BIN
Themes/default/images/topic/veryhot_post_sticky.png


+ 1 - 1
Themes/default/languages/Help.english.php

@@ -564,7 +564,7 @@ $helptxt['posts_and_topics'] = '
 			In order to keep the language on your forum under control, you can censor certain words. This function allows you to convert forbidden words into innocent versions.
 		</li><li>
 			<strong>Topic Settings</strong>
-			Modify the settings related to topics. The number of topics per page, whether sticky topics are enabled or not, the number of messages needed for a topic to be hot, etc.
+			Modify the settings related to topics. The number of topics per page, whether the print-page view is enabled, etc.
 		</li>
 	</ul>';