james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shish 2013-08-05 20:37:40 +01:00
commit 44deff21a8
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.class.php
View File

@ -211,7 +211,9 @@ class DatabaseConfig extends BaseConfig {
$this->database->Execute("DELETE FROM config WHERE name = :name", array("name"=>$name));
$this->database->Execute("INSERT INTO config VALUES (:name, :value)", array("name"=>$name, "value"=>$this->values[$name]));
}
$this->database->cache->delete("config");
// rather than deleting and having some other request(s) do a thundering
// herd of race-conditioned updates, just save the updated version once here
$this->database->cache->set("config", $this->values);
}
}

2
ext/setup/main.php
View File

@ -218,7 +218,7 @@ class Setup extends Extension {
$host .= ":" . $_SERVER["SERVER_PORT"];
}
}
$full = ($_SERVER["HTTPS"] ? "https://" : "http://") . $host . $_SERVER["PHP_SELF"];
$full = (@$_SERVER["HTTPS"] ? "https://" : "http://") . $host . $_SERVER["PHP_SELF"];
$test_url = str_replace("/index.php", "/nicetest", $full);
$nicescript = "<script language='javascript'>

2
ext/setup/theme.php
View File

@ -81,7 +81,7 @@ class SetupTheme extends Themelet {
protected function build_navigation() {
return "
<a href='".make_link()."'>Index</a>
<br><a href='http://redmine.shishnet.org/wiki/shimmie2/Settings'>Help</a>
<br><a href='https://github.com/shish/shimmie2/wiki/Settings'>Help</a>
<br><a href='".make_link("setup/advanced")."'>Advanced</a>
";
}