Merge branch 'master' of github.com:shish/shimmie2
This commit is contained in:
commit
0e25c82fc5
8 changed files with 22 additions and 8 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -223,7 +223,9 @@ $header_html
|
|||
<em>
|
||||
Images © their respective owners,
|
||||
<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> ©
|
||||
<a href="http://www.shishnet.org/">Shish</a> & Co 2007-2012,
|
||||
<a href="http://www.shishnet.org/">Shish</a> &
|
||||
<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
|
||||
2007-2012,
|
||||
based on the Danbooru concept.
|
||||
$debug
|
||||
$contact
|
||||
|
|
|
@ -71,7 +71,9 @@ $header_html
|
|||
<div id="footer">
|
||||
Images © their respective owners,
|
||||
<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> ©
|
||||
<a href="http://www.shishnet.org/">Shish</a> & Co 2007-2012,
|
||||
<a href="http://www.shishnet.org/">Shish</a> &
|
||||
<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
|
||||
2007-2012,
|
||||
based on the Danbooru concept.
|
||||
$debug
|
||||
$contact
|
||||
|
|
|
@ -71,7 +71,9 @@ $header_html
|
|||
<div id="footer">
|
||||
Images © their respective owners,
|
||||
<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> ©
|
||||
<a href="http://www.shishnet.org/">Shish</a> & Co 2007-2012,
|
||||
<a href="http://www.shishnet.org/">Shish</a> &
|
||||
<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
|
||||
2007-2012,
|
||||
based on the Danbooru concept.
|
||||
$debug
|
||||
$contact
|
||||
|
|
|
@ -79,7 +79,9 @@ $header_html
|
|||
<hr>
|
||||
Images © their respective owners,
|
||||
<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> ©
|
||||
<a href="http://www.shishnet.org/">Shish</a> & Co 2007-2012,
|
||||
<a href="http://www.shishnet.org/">Shish</a> &
|
||||
<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
|
||||
|
|
|
@ -184,7 +184,9 @@ class Layout {
|
|||
<div id="footer">
|
||||
Images © their respective owners,
|
||||
<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> ©
|
||||
<a href="http://www.shishnet.org/">Shish</a> & Co 2007-2012,
|
||||
<a href="http://www.shishnet.org/">Shish</a> &
|
||||
<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
|
||||
|
|
|
@ -69,7 +69,9 @@ $header_html
|
|||
<hr>
|
||||
Images © their respective owners,
|
||||
<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> ©
|
||||
<a href="http://www.shishnet.org/">Shish</a> & Co 2007-2012,
|
||||
<a href="http://www.shishnet.org/">Shish</a> &
|
||||
<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
|
||||
2007-2012,
|
||||
based on the Danbooru concept.
|
||||
$debug
|
||||
$contact
|
||||
|
|
|
@ -85,7 +85,9 @@ $header_html
|
|||
<div id="footer">
|
||||
Images © their respective owners,
|
||||
<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> ©
|
||||
<a href="http://www.shishnet.org/">Shish</a> & Co 2007-2012,
|
||||
<a href="http://www.shishnet.org/">Shish</a> &
|
||||
<a href="https://github.com/shish/shimmie2/contributors">The Team</a>
|
||||
2007-2012,
|
||||
based on the Danbooru concept.
|
||||
$debug
|
||||
$contact
|
||||
|
|
Reference in a new issue