Suggested changes from MDL-6654

diff --git a/blocks/rss_client/db/mysql.php b/blocks/rss_client/db/mysql.php
index 7a5d03aff61286fd7efcb78f95ce49ca57e2c224..3940e88be6f70038fe947ae175cd10fa290a255f 100644 (file)
--- a/blocks/rss_client/db/mysql.php
+++ b/blocks/rss_client/db/mysql.php
@@ -36,13 +36,7 @@ function rss_client_upgrade($oldversion) {
             }
             if ($rssfeeds = get_records_select('block_rss_client', $adminsql)) {
                 foreach ($rssfeeds as $rssfeed) {
-                    $rssfeed->shared = 1;
-                    $rssfeed->title = addslashes($rssfeed->title);
-                    $rssfeed->preferredtitle = addslashes($rssfeed->preferredtitle);
-                    $rssfeed->description = addslashes($rssfeed->description);
-                    $rssfeed->url = addslashes($rssfeed->url);
-                    
-                    if (!update_record('block_rss_client', $rssfeed)) {
+                    if (!set_field('block_rss_client', 'shared', 1)) {
                         notice('Could not set '.$rssfeed->title.' as a shared RSS feed.');
                     }
                 }

diff --git a/blocks/rss_client/db/postgres7.php b/blocks/rss_client/db/postgres7.php
index 5eb637bb596072f0b992945026b6ec1ebcd99daa..2659cb096561c913c059273c8c3e550567b697d1 100644 (file)
--- a/blocks/rss_client/db/postgres7.php
+++ b/blocks/rss_client/db/postgres7.php
@@ -38,13 +38,7 @@ function rss_client_upgrade($oldversion) {
             }
             if ($rssfeeds = get_records_select('block_rss_client', $adminsql)) {
                 foreach ($rssfeeds as $rssfeed) {
-                    $rssfeed->shared = 1;
-                    $rssfeed->title = addslashes($rssfeed->title);
-                    $rssfeed->preferredtitle = addslashes($rssfeed->preferredtitle);
-                    $rssfeed->description = addslashes($rssfeed->description);
-                    $rssfeed->url = addslashes($rssfeed->url);
-                    
-                    if (!update_record('block_rss_client', $rssfeed)) {
+                    if (!set_field('block_rss_client', 'shared', 1)) {
                         notice('Could not set '.$rssfeed->title.' as a shared RSS feed.');
                     }
                 }