Commit 2ba80b5bc53f75ccec4a06bbd9e4660b7dee95cd
1 parent
19d5440d
KTAPI ByRef Fixes
Some KTAPI functions return non-reference values by reference. this is now fixed in these instances. There are other instances that still need to be fixed.
Showing
4 changed files
with
9 additions
and
5 deletions
ktapi/KTAPISession.inc.php
| @@ -379,7 +379,8 @@ class KTAPI_UserSession extends KTAPI_Session | @@ -379,7 +379,8 @@ class KTAPI_UserSession extends KTAPI_Session | ||
| 379 | 379 | ||
| 380 | if (PEAR::isError($authenticated) || $authenticated === false) | 380 | if (PEAR::isError($authenticated) || $authenticated === false) |
| 381 | { | 381 | { |
| 382 | - return new KTAPI_Error(_kt("The password is invalid."),$authenticated); | 382 | + $ret=new KTAPI_Error(_kt("The password is invalid."),$authenticated); |
| 383 | + return $ret; | ||
| 383 | } | 384 | } |
| 384 | 385 | ||
| 385 | if (is_null($ip)) | 386 | if (is_null($ip)) |
| @@ -424,7 +425,8 @@ class KTAPI_UserSession extends KTAPI_Session | @@ -424,7 +425,8 @@ class KTAPI_UserSession extends KTAPI_Session | ||
| 424 | $row = DBUtil::getOneResult($sql); | 425 | $row = DBUtil::getOneResult($sql); |
| 425 | if (is_null($row) || PEAR::isError($row)) | 426 | if (is_null($row) || PEAR::isError($row)) |
| 426 | { | 427 | { |
| 427 | - return new KTAPI_Error(KTAPI_ERROR_SESSION_INVALID, $row); | 428 | + $ret= new KTAPI_Error(KTAPI_ERROR_SESSION_INVALID, $row); |
| 429 | + return $ret; | ||
| 428 | } | 430 | } |
| 429 | 431 | ||
| 430 | $sessionid = $row['id']; | 432 | $sessionid = $row['id']; |
lib/authentication/builtinauthenticationprovider.inc.php
| @@ -51,7 +51,8 @@ class KTBuiltinAuthenticationProvider extends KTAuthenticationProvider { | @@ -51,7 +51,8 @@ class KTBuiltinAuthenticationProvider extends KTAuthenticationProvider { | ||
| 51 | function &getAuthenticator($oSource) { | 51 | function &getAuthenticator($oSource) { |
| 52 | // $oSource is null, since the built-in authentication provider | 52 | // $oSource is null, since the built-in authentication provider |
| 53 | // only has a single, non-registered, instance. | 53 | // only has a single, non-registered, instance. |
| 54 | - return new BuiltinAuthenticator; | 54 | + $ret= new BuiltinAuthenticator(); |
| 55 | + return $ret; | ||
| 55 | } | 56 | } |
| 56 | 57 | ||
| 57 | function showUserSource($oUser, $oSource) { | 58 | function showUserSource($oUser, $oSource) { |
lib/database/dbutil.inc
| @@ -168,7 +168,8 @@ class DBUtil { | @@ -168,7 +168,8 @@ class DBUtil { | ||
| 168 | if ($bNoId) | 168 | if ($bNoId) |
| 169 | return; | 169 | return; |
| 170 | else | 170 | else |
| 171 | - return $db->getLastId(); | 171 | + $ret=$db->getLastId(); |
| 172 | + return $ret; | ||
| 172 | } | 173 | } |
| 173 | if (PEAR::isError($res)) { | 174 | if (PEAR::isError($res)) { |
| 174 | DBUtil::logQueryError(DBUtil::lastQuery($db), $res); | 175 | DBUtil::logQueryError(DBUtil::lastQuery($db), $res); |
lib/ktentity.inc
| @@ -749,7 +749,7 @@ class KTEntityUtil { | @@ -749,7 +749,7 @@ class KTEntityUtil { | ||
| 749 | /* */ | 749 | /* */ |
| 750 | }'; | 750 | }'; |
| 751 | 751 | ||
| 752 | - $allcode[] = sprintf('function %s ($iId, $aInfo = null) { $this->iId = $iId; $this->aFieldArr = $aInfo; $this->cacheGlobal =& $GLOBALS["_OBJECTCACHE"][%s]; }' . "\n", $sProxyClassName, $sClassName); | 752 | + $allcode[] = sprintf('function %s ($iId, $aInfo = null) { $this->iId = $iId; $this->aFieldArr = $aInfo; $this->cacheGlobal =& $GLOBALS["_OBJECTCACHE"]["%s"]; }' . "\n", $sProxyClassName, $sClassName); |
| 753 | 753 | ||
| 754 | $gen = sprintf("class %s extends %s {\n", $sProxyClassName, $sClassName); | 754 | $gen = sprintf("class %s extends %s {\n", $sProxyClassName, $sClassName); |
| 755 | $gen .= " " . join("\n ", $allcode) . "\n"; | 755 | $gen .= " " . join("\n ", $allcode) . "\n"; |