Merge pull request #149 from aharris88/master

Add .gitignore file to ignore backups and error-log
This commit is contained in:
mattpass
2013-02-01 11:27:41 -08:00
2 changed files with 3 additions and 1 deletions

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
error-log.txt
backups/*.zip

View File

@@ -236,7 +236,7 @@ if ((!$_SESSION['loggedIn'] || $ICEcoder["accountPassword"] == "") && !strpos($_
header('Location: lib/settings.php');
}
// If we're due to show the settings screen
if (!$_SESSION['loggedIn']) {
elseif (!$_SESSION['loggedIn']) {
// If the password hasn't been set and we're setting it
if ($ICEcoder["accountPassword"] == "" && isset($_POST['accountPassword'])) {
$password = generateHash(strClean($_POST['accountPassword']));