projects
/
mailer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for absent ext-user and misleading data removed
[mailer.git]
/
inc
/
mysql-manager.php
diff --git
a/inc/mysql-manager.php
b/inc/mysql-manager.php
index 2c7ea72a2b1512901cb5122b5a4592531b11577c..6df25311c6e342088fb03a13730bbbcc411eaa74 100644
(file)
--- a/
inc/mysql-manager.php
+++ b/
inc/mysql-manager.php
@@
-428,6
+428,12
@@
function isMember () {
// Fetch user data for given user id
function fetchUserData ($value, $column = 'userid') {
// Fetch user data for given user id
function fetchUserData ($value, $column = 'userid') {
+ // Extension ext-user must be there at any case
+ if (!isExtensionActive('user')) {
+ // Absent ext-user is really not good
+ return false;
+ } // END - if
+
// If we should look for userid secure&set it here
if (substr($column, -2, 2) == 'id') {
// Secure userid
// If we should look for userid secure&set it here
if (substr($column, -2, 2) == 'id') {
// Secure userid
@@
-444,9
+450,6
@@
function fetchUserData ($value, $column = 'userid') {
// Use cache, so it is fine
return true;
}
// Use cache, so it is fine
return true;
}
- } elseif (!isExtensionActive('user')) {
- // Absent ext-user is really not good
- return false;
} elseif (isUserDataValid()) {
// Using cache is fine
return true;
} elseif (isUserDataValid()) {
// Using cache is fine
return true;