瀏覽代碼

Merge pull request #1162 from Arantor/release-2.1

More old stuff to go buh-bye
Arantor 11 年之前
父節點
當前提交
ac14545cfb
共有 34 個文件被更改,包括 1 次插入5 次删除
  1. 0 4
      Sources/Search.php
  2. 二進制
      Themes/default/images/topic/hot_poll.png
  3. 二進制
      Themes/default/images/topic/hot_poll_locked.png
  4. 二進制
      Themes/default/images/topic/hot_poll_locked_sticky.png
  5. 二進制
      Themes/default/images/topic/hot_poll_sticky.png
  6. 二進制
      Themes/default/images/topic/hot_post.png
  7. 二進制
      Themes/default/images/topic/hot_post_locked.png
  8. 二進制
      Themes/default/images/topic/hot_post_locked_sticky.png
  9. 二進制
      Themes/default/images/topic/hot_post_sticky.png
  10. 二進制
      Themes/default/images/topic/my_hot_poll.png
  11. 二進制
      Themes/default/images/topic/my_hot_poll_locked.png
  12. 二進制
      Themes/default/images/topic/my_hot_poll_locked_sticky.png
  13. 二進制
      Themes/default/images/topic/my_hot_poll_sticky.png
  14. 二進制
      Themes/default/images/topic/my_hot_post.png
  15. 二進制
      Themes/default/images/topic/my_hot_post_locked.png
  16. 二進制
      Themes/default/images/topic/my_hot_post_locked_sticky.png
  17. 二進制
      Themes/default/images/topic/my_hot_post_sticky.png
  18. 二進制
      Themes/default/images/topic/my_veryhot_poll.png
  19. 二進制
      Themes/default/images/topic/my_veryhot_poll_locked.png
  20. 二進制
      Themes/default/images/topic/my_veryhot_poll_locked_sticky.png
  21. 二進制
      Themes/default/images/topic/my_veryhot_poll_sticky.png
  22. 二進制
      Themes/default/images/topic/my_veryhot_post.png
  23. 二進制
      Themes/default/images/topic/my_veryhot_post_locked.png
  24. 二進制
      Themes/default/images/topic/my_veryhot_post_locked_sticky.png
  25. 二進制
      Themes/default/images/topic/my_veryhot_post_sticky.png
  26. 二進制
      Themes/default/images/topic/veryhot_poll.png
  27. 二進制
      Themes/default/images/topic/veryhot_poll_locked.png
  28. 二進制
      Themes/default/images/topic/veryhot_poll_locked_sticky.png
  29. 二進制
      Themes/default/images/topic/veryhot_poll_sticky.png
  30. 二進制
      Themes/default/images/topic/veryhot_post.png
  31. 二進制
      Themes/default/images/topic/veryhot_post_locked.png
  32. 二進制
      Themes/default/images/topic/veryhot_post_locked_sticky.png
  33. 二進制
      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'];

二進制
Themes/default/images/topic/hot_poll.png


二進制
Themes/default/images/topic/hot_poll_locked.png


二進制
Themes/default/images/topic/hot_poll_locked_sticky.png


二進制
Themes/default/images/topic/hot_poll_sticky.png


二進制
Themes/default/images/topic/hot_post.png


二進制
Themes/default/images/topic/hot_post_locked.png


二進制
Themes/default/images/topic/hot_post_locked_sticky.png


二進制
Themes/default/images/topic/hot_post_sticky.png


二進制
Themes/default/images/topic/my_hot_poll.png


二進制
Themes/default/images/topic/my_hot_poll_locked.png


二進制
Themes/default/images/topic/my_hot_poll_locked_sticky.png


二進制
Themes/default/images/topic/my_hot_poll_sticky.png


二進制
Themes/default/images/topic/my_hot_post.png


二進制
Themes/default/images/topic/my_hot_post_locked.png


二進制
Themes/default/images/topic/my_hot_post_locked_sticky.png


二進制
Themes/default/images/topic/my_hot_post_sticky.png


二進制
Themes/default/images/topic/my_veryhot_poll.png


二進制
Themes/default/images/topic/my_veryhot_poll_locked.png


二進制
Themes/default/images/topic/my_veryhot_poll_locked_sticky.png


二進制
Themes/default/images/topic/my_veryhot_poll_sticky.png


二進制
Themes/default/images/topic/my_veryhot_post.png


二進制
Themes/default/images/topic/my_veryhot_post_locked.png


二進制
Themes/default/images/topic/my_veryhot_post_locked_sticky.png


二進制
Themes/default/images/topic/my_veryhot_post_sticky.png


二進制
Themes/default/images/topic/veryhot_poll.png


二進制
Themes/default/images/topic/veryhot_poll_locked.png


二進制
Themes/default/images/topic/veryhot_poll_locked_sticky.png


二進制
Themes/default/images/topic/veryhot_poll_sticky.png


二進制
Themes/default/images/topic/veryhot_post.png


二進制
Themes/default/images/topic/veryhot_post_locked.png


二進制
Themes/default/images/topic/veryhot_post_locked_sticky.png


二進制
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>';