Merge branch 'master' of github.com:shish/shimmie2

index.php

@@ -50,7 +50,7 @@
  * Each of these can be imported at the start of a function with eg "global $page, $user;"
  */
 
-if(empty($database_dsn) && !file_exists("config.php")) {
+if(!file_exists("config.php")) {
 	header("Location: install.php");
 	exit;
 }

themes/danbooru/layout.class.php

@@ -223,7 +223,9 @@ $header_html
         <em>
 			Images &copy; their respective owners,
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
-			<a href="http://www.shishnet.org/">Shish</a> &amp; Co 2007-2012,
+			<a href="http://www.shishnet.org/">Shish</a> &amp;
+			<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
+			2007-2012,
 			based on the Danbooru concept.
 			$debug
 			$contact

themes/default/layout.class.php

@@ -71,7 +71,9 @@ $header_html
 		<div id="footer">
 			Images &copy; their respective owners,
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
-			<a href="http://www.shishnet.org/">Shish</a> &amp; Co 2007-2012,
+			<a href="http://www.shishnet.org/">Shish</a> &amp;
+			<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
+			2007-2012,
 			based on the Danbooru concept.
 			$debug
 			$contact

themes/flat/layout.class.php

@@ -71,7 +71,9 @@ $header_html
 		<div id="footer">
 			Images &copy; their respective owners,
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
-			<a href="http://www.shishnet.org/">Shish</a> &amp; Co 2007-2012,
+			<a href="http://www.shishnet.org/">Shish</a> &amp;
+			<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
+			2007-2012,
 			based on the Danbooru concept.
 			$debug
 			$contact

themes/futaba/layout.class.php

@@ -79,7 +79,9 @@ $header_html
 			<hr>
 			Images &copy; their respective owners,
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
-			<a href="http://www.shishnet.org/">Shish</a> &amp; Co 2007-2012,
+			<a href="http://www.shishnet.org/">Shish</a> &amp;
+			<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
+			2007-2012,
 			based on the Danbooru concept.
 			<br>Futaba theme based on 4chan's layout and CSS :3
 			$debug

themes/lite/layout.class.php

@@ -184,7 +184,9 @@ class Layout {
 		<div id="footer">
 			Images &copy; their respective owners,
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
-			<a href="http://www.shishnet.org/">Shish</a> &amp; Co 2007-2012,
+			<a href="http://www.shishnet.org/">Shish</a> &amp;
+			<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
+			2007-2012,
 			based on the Danbooru concept.<br />
 			Lite Theme by <a href="http://seemslegit.com">Zach</a>
 			$debug

themes/old_default/layout.class.php

@@ -69,7 +69,9 @@ $header_html
 			<hr>
 			Images &copy; their respective owners,
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
-			<a href="http://www.shishnet.org/">Shish</a> &amp; Co 2007-2012,
+			<a href="http://www.shishnet.org/">Shish</a> &amp;
+			<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
+			2007-2012,
 			based on the Danbooru concept.
 			$debug
 			$contact

themes/warm/layout.class.php

@@ -85,7 +85,9 @@ $header_html
 		<div id="footer">
 			Images &copy; their respective owners,
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
-			<a href="http://www.shishnet.org/">Shish</a> &amp; Co 2007-2012,
+			<a href="http://www.shishnet.org/">Shish</a> &amp;
+			<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
+			2007-2012,
 			based on the Danbooru concept.
 			$debug
 			$contact