Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle

Conflicts:
	filter/tex/version.php
	lang/en/admin.php

diff --cc filter/tex/db/upgrade.php
index 659c7f5,ac580cf..b0d4578
--- 1/filter/tex/db/upgrade.php
--- 2/filter/tex/db/upgrade.php
+++ b/filter/tex/db/upgrade.php
@@@ -44,9 -44,22 +44,26 @@@ function xmldb_filter_tex_upgrade($oldv
      // Moodle v2.5.0 release upgrade line.
      // Put any upgrade step following this.
  
 -    if ($oldversion < 2013050101) {
 +
 +    // Moodle v2.6.0 release upgrade line.
 +    // Put any upgrade step following this.
 +
++    if ($oldversion < 2013120300) {
+         $settings = array(
+                 'density', 'latexbackground', 'convertformat', 'pathlatex',
+                 'convertformat', 'pathconvert', 'pathdvips', 'latexpreamble');
+ 
+         // Move tex settings to config_pluins and delete entries from the config table.
+         foreach ($settings as $setting) {
+             $existingkey = 'filter_tex_'.$setting;
+             if (array_key_exists($existingkey, $CFG)) {
+                 set_config($setting, $CFG->{$existingkey}, 'filter_tex');
+                 unset_config($existingkey);
+             }
+         }
+ 
 -        upgrade_plugin_savepoint(true, 2013050101, 'filter', 'tex');
++        upgrade_plugin_savepoint(true, 2013120300, 'filter', 'tex');
+     }
+ 
      return true;
  }

diff --cc filter/tex/settings.php
Simple merge

diff --cc filter/tex/version.php
index 10a6576,01b4b9e..5104f39
--- 1/filter/tex/version.php
--- 2/filter/tex/version.php
+++ b/filter/tex/version.php
@@@ -25,6 -25,6 +25,6 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2013110500;        // The current plugin version (Date: YYYYMMDDXX)
 -$plugin->version   = 2013050101;        // The current plugin version (Date: YYYYMMDDXX)
 -$plugin->requires  = 2013050100;        // Requires this Moodle version
++$plugin->version   = 2013120300;        // The current plugin version (Date: YYYYMMDDXX)
 +$plugin->requires  = 2013110500;        // Requires this Moodle version
  $plugin->component = 'filter_tex';      // Full name of the plugin (used for diagnostics)

diff --cc lang/en/admin.php
index 324802e,d761d76..cd99894
--- 1/lang/en/admin.php
--- 2/lang/en/admin.php
+++ b/lang/en/admin.php
@@@ -622,11 -616,7 +620,9 @@@ $string['langmenu'] = 'Display languag
  $string['langpackwillbeupdated'] = 'NOTE: Moodle will try to download updates for your language packs during the upgrade.';
  $string['langstringcache'] = 'Cache all language strings';
  $string['languagesettings'] = 'Language settings';
- $string['latexpreamble'] = 'LaTeX preamble';
- $string['latexsettings'] = 'LaTeX renderer Settings';
  $string['latinexcelexport'] = 'Excel encoding';
 +$string['legacyfilesaddallowed'] = 'Allow adding to legacy course files';
 +$string['legacyfilesaddallowed_help'] = 'If a course has legacy course files, allow new files and folders to be added to it.';
  $string['legacyfilesinnewcourses'] = 'Legacy course files in new courses';
  $string['legacyfilesinnewcourses_help'] = 'By default legacy course files areas are available only in upgraded courses. Please note some features like single activity backup/restore are not compatible with this settings.';
  $string['licensesettings'] = 'Licence settings';
@@@ -786,10 -774,6 +782,7 @@@ $string['order2'] = 'Second'
  $string['order3'] = 'Third';
  $string['order4'] = 'Fourth';
  $string['passwordpolicy'] = 'Password policy';
- $string['pathconvert'] = 'Path of <i>convert</i> binary';
- $string['pathdvips'] = 'Path of <i>dvips</i> binary';
- $string['pathlatex'] = 'Path of <i>latex</i> binary';
 +$string['passwordresettime'] = 'Maximum time to validate password reset request';
  $string['pathtoclam'] = 'clam AV path';
  $string['pathtodot'] = 'Path to dot';
  $string['pathtodot_help'] = 'Path to dot. Probably something like /usr/bin/dot. To be able to generate graphics from DOT files, you must have installed the dot executable and point to it here. Note that, for now, this only used by the profiling features (Development->Profiling) built into Moodle.';