diff options
| author | Arthur <arthur@hoa.ro> | 2017-01-03 14:45:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 14:45:10 +0100 |
| commit | f3ca027d3aeca125f4b754a2e7d4cbc79d00fe70 (patch) | |
| tree | d27422a514cebe5266efe7472292b7785f3d4920 | |
| parent | 436479c58f0da23fb05c3b26941beabd89d87561 (diff) | |
| parent | e3a430babb9610c92102eb9b19b7e8e005192cf0 (diff) | |
| download | Shaarli-f3ca027d3aeca125f4b754a2e7d4cbc79d00fe70.tar.gz Shaarli-f3ca027d3aeca125f4b754a2e7d4cbc79d00fe70.tar.zst Shaarli-f3ca027d3aeca125f4b754a2e7d4cbc79d00fe70.zip | |
Merge pull request #734 from ArthurHoaro/hotfix/api-install-error
Fix fatal error during the install
| -rw-r--r-- | index.php | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1949,8 +1949,8 @@ function install($conf) | |||
| 1949 | $conf->set( | 1949 | $conf->set( |
| 1950 | 'api.secret', | 1950 | 'api.secret', |
| 1951 | generate_api_secret( | 1951 | generate_api_secret( |
| 1952 | $this->conf->get('credentials.login'), | 1952 | $conf->get('credentials.login'), |
| 1953 | $this->conf->get('credentials.salt') | 1953 | $conf->get('credentials.salt') |
| 1954 | ) | 1954 | ) |
| 1955 | ); | 1955 | ); |
| 1956 | try { | 1956 | try { |