Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d234f4b
Choose a base ref
...
head repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3f0f379
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 6, 2012

  1. Ignore .idea files for phpStorm.

    @vboctor
    vboctor committed May 6, 2012
    Copy the full SHA
    a49f788 View commit details

  2. Fixes #14087: Installation script doesn't set the crypto_master_salt … 

    …causing errors.
    @vboctor
    vboctor committed May 6, 2012

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3f0f379 View commit details
Showing with 7 additions and 1 deletion.
  1. +1 −0 .gitignore
  2. +6 −1 admin/install.php
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ plugins/*
.cache
.project
.settings
.idea/
*.kdev4

# IIS7
7 changes: 6 additions & 1 deletion admin/install.php
View file
Original file line number Diff line number Diff line change
@@ -813,7 +813,12 @@ function InsertData( $p_table, $p_data ) {
}

$t_config .= "\r\n";
$t_write_failed = true;

# generate a crypto salt based on time of installation.
$t_crypto_master_salt = md5((string)time());
$t_config .= "\t\$g_crypto_master_salt = '$t_crypto_master_salt';\r\n";

$t_write_failed = true;

if( !$t_config_exists ) {
if( $fd = @fopen( $t_config_filename, 'w' ) ) {