Throw NoObjectTypeException on Notice->getObjectType if no string
This commit is contained in:
parent
45b523bada
commit
5999171c11
@ -308,6 +308,9 @@ class Notice extends Managed_DataObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getObjectType($canonical=false) {
|
public function getObjectType($canonical=false) {
|
||||||
|
if (is_null($this->object_type) || $this->object_type==='') {
|
||||||
|
throw new NoObjectTypeException($this);
|
||||||
|
}
|
||||||
return ActivityUtils::resolveUri($this->object_type, $canonical);
|
return ActivityUtils::resolveUri($this->object_type, $canonical);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
41
lib/noobjecttypeexception.php
Normal file
41
lib/noobjecttypeexception.php
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* StatusNet, the distributed open-source microblogging tool
|
||||||
|
*
|
||||||
|
* Class for an exception when a database lookup returns no results
|
||||||
|
*
|
||||||
|
* PHP version 5
|
||||||
|
*
|
||||||
|
* LICENCE: This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* @category Exception
|
||||||
|
* @package GNUsocial
|
||||||
|
* @author Mikael Nordfeldth <mmn@hethane.se>
|
||||||
|
* @copyright 2013 Free Software Foundation, Inc.
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||||
|
* @link http://www.gnu.org/software/social/
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||||
|
|
||||||
|
class NoObjectTypeException extends ServerException
|
||||||
|
{
|
||||||
|
public $stored; // The object with query that gave no results
|
||||||
|
|
||||||
|
public function __construct(Notice $stored)
|
||||||
|
{
|
||||||
|
$this->stored = $stored;
|
||||||
|
parent::__construct(sprintf(_('Notice has no object type.')));
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user