Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

2013-01-21 13:17:13 +01:00 · 2013-01-21 13:17:13 +01:00 · 18ca523b18
commit 18ca523b18
parent 8185b85be7 7a68fc9525
22 changed files with 22 additions and 22 deletions
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,5 +1,5 @@
 # License
-Copyright (c) 2010-2012 Tinyboard Development Group (tinyboard.org)
+Copyright (c) 2010-2013 Tinyboard Development Group (tinyboard.org)

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/inc/anti-bot.php
+++ b/inc/anti-bot.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/cache.php
+++ b/inc/cache.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/config.php
+++ b/inc/config.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 *  
 *  WARNING: This is a project-wide configuration file and is overwritten when upgrading to a newer
 *  version of Tinyboard. Please leave this file unchanged, or it will be a lot harder for you to upgrade.
--- a/inc/database.php
+++ b/inc/database.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/display.php
+++ b/inc/display.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/events.php
+++ b/inc/events.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/filters.php
+++ b/inc/filters.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/functions.php
+++ b/inc/functions.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/image.php
+++ b/inc/image.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/mod.php
+++ b/inc/mod.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 // WARNING: Including this file is DEPRECIATED. It's only here to support older versions and won't exist forever.
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/mod/ban.php
+++ b/inc/mod/ban.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/remote.php
+++ b/inc/remote.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/inc/template.php
+++ b/inc/template.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
--- a/mod.php
+++ b/mod.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 require 'inc/functions.php';
--- a/post.php
+++ b/post.php
@ -1,7 +1,7 @@
 <?php

 /*
- *  Copyright (c) 2010-2012 Tinyboard Development Group
+ *  Copyright (c) 2010-2013 Tinyboard Development Group
 */

 require 'inc/functions.php';
--- a/templates/generic_page.html
+++ b/templates/generic_page.html
@ -35,7 +35,7 @@
 	{% endfor %} {{ btn.next }}</div>
 	{{ boardlist.bottom }}
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2012 Tinyboard Development Group</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}
--- a/templates/index.html
+++ b/templates/index.html
@ -35,7 +35,7 @@
 	{% endfor %} {{ btn.next }}</div>
 	{{ boardlist.bottom }}
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2012 Tinyboard Development Group</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}
--- a/templates/page.html
+++ b/templates/page.html
@ -19,7 +19,7 @@
 	{{ body }}
 	<hr>
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2012 Tinyboard Development Group</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
 	</footer>
 </body>
 </html>
--- a/templates/thread.html
+++ b/templates/thread.html
@ -62,7 +62,7 @@

 	{{ boardlist.bottom }}
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2012 Tinyboard Development Group</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}