Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-35603 backup: fix coding style issues

Conflicts:
	backup/util/ui/restore_ui_components.php
  • Loading branch information...
commit b2c04be9c5fd3cfc223a5dc59363bffdb43de1f8 1 parent ecfa79b
@danpoltawski danpoltawski authored
View
16 backup/util/ui/renderer.php
@@ -522,14 +522,14 @@ public function render_restore_course_search(restore_course_search $component) {
$output = html_writer::start_tag('div', array('class' => 'restore-course-search'));
- $count_str = '';
+ $countstr = '';
if ($component->has_more_results()) {
- $count_str = get_string('morecoursesearchresults', 'backup', $component->get_count());
+ $countstr = get_string('morecoursesearchresults', 'backup', $component->get_count());
} else {
- $count_str = get_string('totalcoursesearchresults', 'backup', $component->get_count());
+ $countstr = get_string('totalcoursesearchresults', 'backup', $component->get_count());
}
- $output .= html_writer::tag('div', $count_str, array('class'=>'rcs-totalresults'));
+ $output .= html_writer::tag('div', $countstr, array('class'=>'rcs-totalresults'));
$output .= html_writer::start_tag('div', array('class' => 'rcs-results'));
$table = new html_table();
@@ -599,14 +599,14 @@ public function render_import_course_search(import_course_search $component) {
return $output;
}
- $count_str = '';
+ $countstr = '';
if ($component->has_more_results()) {
- $count_str = get_string('morecoursesearchresults', 'backup', $component->get_count());
+ $countstr = get_string('morecoursesearchresults', 'backup', $component->get_count());
} else {
- $count_str = get_string('totalcoursesearchresults', 'backup', $component->get_count());
+ $countstr = get_string('totalcoursesearchresults', 'backup', $component->get_count());
}
- $output .= html_writer::tag('div', $count_str, array('class'=>'ics-totalresults'));
+ $output .= html_writer::tag('div', $countstr, array('class'=>'ics-totalresults'));
$output .= html_writer::start_tag('div', array('class' => 'ics-results'));
$table = new html_table();
View
6 backup/util/ui/restore_ui_components.php
@@ -69,7 +69,7 @@
* Indicates if we have more than maxresults found.
* @var boolean
*/
- private $has_more_results = false;
+ private $hasmoreresults = false;
/**
* Constructor
@@ -196,7 +196,7 @@ public function __construct(array $config=array()) {
}
// Check if we are over the limit.
if ($this->totalcount+1 > self::$MAXRESULTS) {
- $this->has_more_results = true;
+ $this->hasmoreresults = true;
break;
}
// If not, then continue.
@@ -213,7 +213,7 @@ public function __construct(array $config=array()) {
if ($this->results === null) {
$this->search();
}
- return $this->has_more_results;
+ return $this->hasmoreresults;
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.