mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-25 00:02:18 +02:00
Code Issues Projects Releases Wiki Activity

MDL-24888, wiki tags' itemtype should be wiki_pages, taglib will try to query table by itemtype in cron

Browse Source
This commit is contained in:
Dongsheng Cai
2010-10-28 07:51:59 +00:00
parent 27bfb970f2
commit f0f77dfaae
7 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mod/wiki/backup/moodle2/backup_wiki_stepslib.php
View File

@@ -105,7 +105,7 @@ class backup_wiki_activity_structure_step extends backup_activity_structure_step
JOIN {tag_instance} ti ON ti.tagid = t.id
WHERE ti.itemtype = ?
AND ti.itemid = ?', array(
backup_helper::is_sqlparam('wiki_page'),
backup_helper::is_sqlparam('wiki_pages'),
backup::VAR_PARENTID));
}

2
mod/wiki/backup/moodle2/restore_wiki_stepslib.php
View File

@@ -144,7 +144,7 @@ class restore_wiki_activity_structure_step extends restore_activity_structure_st
$tag = $data->rawname;
$itemid = $this->get_new_parentid('wiki_page');
tag_set_add('wiki_page', $itemid, $tag);
tag_set_add('wiki_pages', $itemid, $tag);
}
protected function after_execute() {

10
mod/wiki/db/upgrade.php
View File

@@ -350,7 +350,17 @@ function xmldb_wiki_upgrade($oldversion) {
upgrade_mod_savepoint(true, 2010102500, 'wiki');
}
if ($oldversion < 2010102800) {
$sql = "UPDATE {tag_instance}
SET itemtype = 'wiki_pages'
WHERE itemtype = 'wiki_page'";
$DB->execute($sql);
echo $OUTPUT->notification('Updating tags itemtype', 'notifysuccess');
upgrade_mod_savepoint(true, 2010102800, 'wiki');
}
return true;
}

4
mod/wiki/lib.php
View File

@@ -173,10 +173,10 @@ function wiki_reset_userdata($data) {
foreach ($subwikis as $subwiki) {
if ($pages = $DB->get_records('wiki_pages', array('subwikiid' => $subwiki->id))) {
foreach ($pages as $page) {
$tags = tag_get_tags_array('wiki_page', $page->id);
$tags = tag_get_tags_array('wiki_pages', $page->id);
foreach ($tags as $tagid => $tagname) {
// Delete the related tag_instances related to the wiki page.
$errors = tag_delete_instance('wiki_page', $page->id, $tagid);
$errors = tag_delete_instance('wiki_pages', $page->id, $tagid);
$status[] = array('component' => $componentstr, 'item' => get_string('tagsdeleted', 'wiki'), 'error' => $errors);
}
}

2
mod/wiki/locallib.php
View File

@@ -1194,7 +1194,7 @@ function wiki_print_page_content($page, $context, $subwikiid) {
echo $OUTPUT->box($html);
if (!empty($CFG->usetags)) {
$tags = tag_get_tags_array('wiki_page', $page->id);
$tags = tag_get_tags_array('wiki_pages', $page->id);
echo '<p class="wiki-tags"><span>Tags: </span>' . join($tags, ", ") . '</p>';
}

4
mod/wiki/pagelib.php
View File

@@ -553,7 +553,7 @@ class page_wiki_edit extends page_wiki {
}
if (!empty($CFG->usetags)) {
$params['tags'] = tag_get_tags_csv('wiki_page', $this->page->id, TAG_RETURN_TEXT);
$params['tags'] = tag_get_tags_csv('wiki_pages', $this->page->id, TAG_RETURN_TEXT);
}
$form = new mod_wiki_edit_form($url, $params);
@@ -1962,7 +1962,7 @@ class page_wiki_save extends page_wiki_edit {
$errors = $this->process_uploads($context);
}
if (!empty($CFG->usetags)) {
tag_set('wiki_page', $this->page->id, $data->tags);
tag_set('wiki_pages', $this->page->id, $data->tags);
}
$message = '<p>' . get_string('saving', 'wiki') . '</p>';

2
mod/wiki/version.php
View File

@@ -32,6 +32,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$module->version = 2010102500; // The current module version (Date: YYYYMMDDXX)
$module->version = 2010102800; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2010080300;
$module->cron = 0; // Period for cron to check this module (secs)