L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

Browse Source
This commit is contained in:
AMOS bot
2013-09-08 00:43:12 +00:00
parent efcbed9b73 28980dbee6
commit 700e92b8d4
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/rss_client/viewfeed.php
+4 -3
View File
@@ -84,15 +84,16 @@ if (!empty($rssrecord->preferredtitle)) {
$feedtitle = $rss->get_title();
}
echo '<table align="center" width="50%" cellspacing="1">'."\n";
echo '<tr><td colspan="2"><strong>'. $feedtitle .'</strong></td></tr>'."\n";
echo '<tr><td colspan="2"><strong>'. s($feedtitle) .'</strong></td></tr>'."\n";
foreach ($rss->get_items() as $item) {
echo '<tr><td valign="middle">'."\n";
echo '<a href="'. $item->get_link() .'" target="_blank"><strong>'. $item->get_title();
echo '<a href="'.$item->get_link().'" target="_blank"><strong>';
echo s($item->get_title());
echo '</strong></a>'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";
echo '<tr><td colspan="2"><small>';
echo $item->get_description() .'</small></td></tr>'."\n";
echo format_text($item->get_description(), FORMAT_HTML) .'</small></td></tr>'."\n";
}
echo '</table>'."\n";
blog/renderer.php
+7 -4
View File
@@ -119,11 +119,14 @@ class core_blog_renderer extends plugin_renderer_base {
// Body.
$o .= format_text($entry->summary, $entry->summaryformat, array('overflowdiv' => true));
// Uniquehash is used as a link to an external blog.
if (!empty($entry->uniquehash)) {
$o .= $this->output->container_start('externalblog');
$o .= html_writer::link($entry->uniquehash, get_string('linktooriginalentry', 'blog'));
$o .= $this->output->container_end();
// Uniquehash is used as a link to an external blog.
$url = clean_param($entry->uniquehash, PARAM_URL);
if (!empty($url)) {
$o .= $this->output->container_start('externalblog');
$o .= html_writer::link($url, get_string('linktooriginalentry', 'blog'));
$o .= $this->output->container_end();
}
}
// Links to tags.
lib/simplepie/readme_moodle.txt
+2
View File
@@ -5,6 +5,8 @@ Obtained from http://github.com/simplepie/simplepie/commit/798f4674468316b8cc70f
Changes:
* None. This import contains _NO_CHANGES_ to the simplepie.inc file, changes are
controlled through OO extension of the classes instead.
* Exception: The Sanitizer has been modified to return valid URLs. The change
is done through OO extension in 25 and upwards but not in 23 and 24.
Dan Poltawski <[email protected]>
Petr Skoda
lib/simplepie/simplepie.class.php
+4
View File
@@ -14466,6 +14466,10 @@ class SimplePie_Sanitize
if ($type & SIMPLEPIE_CONSTRUCT_IRI)
{
$data = SimplePie_Misc::absolutize_url($data, $base);
// Moodle modification - Only return valid URLs. Note this change is interim and
// 2.5 and upwards have the cleaning performed in our own sanitizer.
$data = clean_param($data, PARAM_URL);
// End of Moodle modification.
}
if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
version.php
+2 -2
View File
@@ -29,11 +29,11 @@
defined('MOODLE_INTERNAL') || die();
$version = 2012120305.13; // 20121203 = branching date YYYYMMDD - do not modify!
$version = 2012120306.00; // 20121203 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
$release = '2.4.5+ (Build: 20130905)'; // Human-friendly version name
$release = '2.4.6 (Build: 20130909)'; // Human-friendly version name
$branch = '24'; // this version's branch
$maturity = MATURITY_STABLE; // this version's maturity level