GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix type conversion warnings caused when calling getUser / getProfile for the second time

Browse Source
This commit is contained in:
Shashi Gowda 2011-04-09 22:16:52 +05:30
parent f47027abbe
commit fc21e5c76b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -100,7 +100,7 @@ class Notice extends Memcached_DataObject
function getProfile() function getProfile()
{ {
if ($this->_profile == -1) { if (is_int($this->_profile) && $this->_profile == -1) {
$this->_profile = Profile::staticGet('id', $this->profile_id); $this->_profile = Profile::staticGet('id', $this->profile_id);
if (empty($this->_profile)) { if (empty($this->_profile)) {

2
classes/Profile.php
View File

@ -56,7 +56,7 @@ class Profile extends Memcached_DataObject
function getUser() function getUser()
{ {
if ($this->_user == -1) { if (is_int($this->_user) && $this->_user == -1) {
$this->_user = User::staticGet('id', $this->id); $this->_user = User::staticGet('id', $this->id);
} }

2
classes/User.php
View File

@ -80,7 +80,7 @@ class User extends Memcached_DataObject
*/ */
function getProfile() function getProfile()
{ {
if ($this->_profile == -1) { // invalid but distinct from null if (is_int($this->_profile) && $this->_profile == -1) { // invalid but distinct from null
$this->_profile = Profile::staticGet('id', $this->id); $this->_profile = Profile::staticGet('id', $this->id);
if (empty($this->_profile)) { if (empty($this->_profile)) {
throw new UserNoProfileException($this); throw new UserNoProfileException($this);