Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-09 01:46:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source 
Conflicts:
	inc/locales/en_US/LC_MESSAGES/messages.mo
	inc/locales/en_US/LC_MESSAGES/messages.po
This commit is contained in:
nuxsmin
2015-10-12 12:46:21 +02:00
parent 0698d9189d 180ce5942f
commit 98dbe40834
25 changed files with 4833 additions and 4260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
inc/Init.class.php
View File

@@ -220,6 +220,11 @@ class Init
}
}
// Volver a cargar la configuración si se recarga la página
if (Request::checkReload()){
Config::readConfig();
}
if (self::isLoggedIn() || Request::analyze('isAjax', false, true)) {
return;
}