projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed ui behaviour during FA upgrade.
[fa-stable.git]
/
includes
/
current_user.inc
diff --git
a/includes/current_user.inc
b/includes/current_user.inc
index 77e8dc3e471707e139509000211a9548ccc27017..fc11db8442acec040c7072dc8e9bccfa48a31025 100644
(file)
--- a/
includes/current_user.inc
+++ b/
includes/current_user.inc
@@
-64,8
+64,9
@@
class current_user
if (db_num_rows($Auth_Result) > 0)
{
$myrow = db_fetch($Auth_Result);
if (db_num_rows($Auth_Result) > 0)
{
$myrow = db_fetch($Auth_Result);
+ $this->old_db = isset($myrow["full_access"]);
if (! @$myrow["inactive"]) {
if (! @$myrow["inactive"]) {
- if (
isset($myrow["full_access"])
) {
+ if (
$this->old_db
) {
// Transition code:
// db was not yet upgraded after source update to v.2.2
// give enough access for admin user to continue upgrade
// Transition code:
// db was not yet upgraded after source update to v.2.2
// give enough access for admin user to continue upgrade
@@
-115,12
+116,11
@@
class current_user
function check_user_access()
{
global $security_groups;
function check_user_access()
{
global $security_groups;
- if (
isset($security_groups)
) {
+ if (
$this->old_db
) {
// notification after upgrade from pre-2.2 version
// notification after upgrade from pre-2.2 version
-// display_notification(_("After database upgrade don't forget to remove \$security_groups and \$security_headings from config.php file!"));
- return is_array(@$security_groups[$this->access]);
+ return isset($security_groups) && is_array(@$security_groups[$this->access]);
} else
} else
- return is_array($this->role_set);
+ return
!isset($security_groups) &&
is_array($this->role_set);
}
function can_access_page($page_level)
}
function can_access_page($page_level)