mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 00:16:46 +02:00
Merge branch 'MDL-83720-405' of https://github.com/paulholden/moodle into MOODLE_405_STABLE
This commit is contained in:
commit
daf68856ad
1 changed files with 9 additions and 12 deletions
|
@ -14,21 +14,12 @@
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
/**
|
|
||||||
* Contains class core_tag\output\tag
|
|
||||||
*
|
|
||||||
* @package core_tag
|
|
||||||
* @copyright 2015 Marina Glancy
|
|
||||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace core_tag\output;
|
namespace core_tag\output;
|
||||||
|
|
||||||
use renderable;
|
use renderable;
|
||||||
use templatable;
|
use templatable;
|
||||||
use renderer_base;
|
use renderer_base;
|
||||||
use stdClass;
|
use stdClass;
|
||||||
use moodle_url;
|
|
||||||
use core_tag_tag;
|
use core_tag_tag;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -79,9 +70,15 @@ class tag implements renderable, templatable {
|
||||||
$r->tagcollid = clean_param($this->record->tagcollid, PARAM_INT);
|
$r->tagcollid = clean_param($this->record->tagcollid, PARAM_INT);
|
||||||
$r->rawname = clean_param($this->record->rawname, PARAM_TAG);
|
$r->rawname = clean_param($this->record->rawname, PARAM_TAG);
|
||||||
$r->name = clean_param($this->record->name, PARAM_TAG);
|
$r->name = clean_param($this->record->name, PARAM_TAG);
|
||||||
$format = clean_param($this->record->descriptionformat, PARAM_INT);
|
[$r->description, $r->descriptionformat] = \core_external\util::format_text(
|
||||||
list($r->description, $r->descriptionformat) = \core_external\util::format_text($this->record->description,
|
$this->record->description,
|
||||||
$format, \context_system::instance(), 'core', 'tag', $r->id);
|
$this->record->descriptionformat,
|
||||||
|
\context_system::instance(),
|
||||||
|
'tag',
|
||||||
|
'description',
|
||||||
|
$r->id,
|
||||||
|
);
|
||||||
|
|
||||||
$r->flag = clean_param($this->record->flag, PARAM_INT);
|
$r->flag = clean_param($this->record->flag, PARAM_INT);
|
||||||
if (isset($this->record->isstandard)) {
|
if (isset($this->record->isstandard)) {
|
||||||
$r->isstandard = clean_param($this->record->isstandard, PARAM_INT) ? 1 : 0;
|
$r->isstandard = clean_param($this->record->isstandard, PARAM_INT) ? 1 : 0;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue