mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-50919 tags: minor fixes and version bump

Browse Source 
This fixes:
- An incorrect exception message.
- tablelib weird behavior creating up to
  pagesize empty rows.

Also forces a version bump so new webservices will become installed.
This commit is contained in:
Eloy Lafuente (stronk7) 2015-09-02 13:25:44 +02:00
parent 544be5ad4d
commit 8a6900ff56
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tests/behat/behat_forms.php
View File

@ -174,7 +174,7 @@ class behat_forms extends behat_base {
*/ */
public function i_press_key_in_the_field($key, $field) { public function i_press_key_in_the_field($key, $field) {
if (!$this->running_javascript()) { if (!$this->running_javascript()) {
throw new DriverException('Key press step is not available with Javascript enabled'); throw new DriverException('Key press step is not available with Javascript disabled');
} }
$fld = behat_field_manager::get_form_field_from_label($field, $this); $fld = behat_field_manager::get_form_field_from_label($field, $this);
$modifier = null; $modifier = null;

4
tag/classes/manage_table.php
View File

@ -119,7 +119,7 @@ class core_tag_manage_table extends table_sql {
$total = $grandtotal; $total = $grandtotal;
} }
$this->pagesize($pagesize, $total); $this->pagesize(min($pagesize, $total), $total);
$this->totalcount = $total; $this->totalcount = $total;
} }
@ -253,4 +253,4 @@ class core_tag_manage_table extends table_sql {
null, array('class' => 'action-icon tagdelete')); null, array('class' => 'action-icon tagdelete'));
return $o; return $o;
} }
} }

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$version = 2015082800.00; // YYYYMMDD = weekly release date of this DEV branch. $version = 2015090100.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches. // RR = release increments - 00 in DEV branches.
// .XX = incremental changes. // .XX = incremental changes.