Skip to content

Commit

Permalink
MDL-19786 Renamed user_picture and action_icon component classes to m…
Browse files Browse the repository at this point in the history
…oodle_user_picture and moodle_action_icon. Also moved around the classes in a more logical order in outputcomponents.php
  • Loading branch information
nicolasconnault committed Aug 10, 2009
1 parent 94056d9 commit beb5629
Show file tree
Hide file tree
Showing 7 changed files with 1,311 additions and 1,311 deletions.
10 changes: 5 additions & 5 deletions blocks/rss_client/managefeeds.php
@@ -1,7 +1,7 @@
<?php

// This file is part of Moodle - http://moodle.org/
//
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
Expand All @@ -11,7 +11,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

Expand Down Expand Up @@ -121,13 +121,13 @@
'<div class="url">' . $OUTPUT->link($feed->url, $feed->url) .'</div>' .
'<div class="description">' . $feed->description . '</div>';

$editaction = new action_icon();
$editaction = new moodle_action_icon();
$editaction->link->url = $CFG->wwwroot .'/blocks/rss_client/editfeed.php?rssid=' . $feed->id . $extraparams;
$editaction->link->title = get_string('edit');
$editaction->image->src = $OUTPUT->old_icon_url('t/edit');
$editaction->image->alt = get_string('edit');

$deleteaction = new action_icon();
$deleteaction = new moodle_action_icon();
$deleteaction->link->url = $CFG->wwwroot .'/blocks/rss_client/managefeeds.php?deleterssid=' . $feed->id .
'&sesskey=' . sesskey() . $extraparams;
$deleteaction->link->title = get_string('delete');
Expand Down
2 changes: 1 addition & 1 deletion lib/commentlib.php
Expand Up @@ -388,7 +388,7 @@ public function get_comments($page = '') {
$user->lastname = $c->lastname;
$user->imagealt = $c->imagealt;
$c->content = format_text($c->content, $c->format);
$userpic = new user_picture();
$userpic = new moodle_user_picture();
$userpic->user = $user;
$userpic->courseid = $this->course->id;
$userpic->link = true;
Expand Down
4 changes: 2 additions & 2 deletions lib/deprecatedlib.php
Expand Up @@ -2675,7 +2675,7 @@ function print_user_picture($user, $courseid, $picture=NULL, $size=0, $return=fa

// debugging('print_user_picture() has been deprecated. Please change your code to use $OUTPUT->user_picture($user, $courseid).');

$userpic = new user_picture();
$userpic = new moodle_user_picture();
$userpic->user = $user;
$userpic->courseid = $courseid;
$userpic->size = $size;
Expand Down Expand Up @@ -3287,7 +3287,7 @@ function popup_form($baseurl, $options, $formid, $selected='', $nothing='choose'
$baseurl = new moodle_url($baseurl);
$select = moodle_select::make_popup_form($baseurl, $name, $options, $formid, $selected);
$select->disabled = $disabled;

if (!empty($submitvalue)) {
$select->form->button->text = $submitvalue;
}
Expand Down

0 comments on commit beb5629

Please sign in to comment.