Uploaded image for project: 'Moodle'
  1. Moodle
  2. MDL-70073

Little discrepancies found between 310 and master (take #2)

    XMLWordPrintable

Details

    • Task
    • Status: Closed
    • Minor
    • Resolution: Fixed
    • 3.10, 4.0
    • 3.10
    • Badges, Payments

    Description

      After MDL-70010 was integrated, both 310_STABLE and master were 100% on-sync.

      But running another routine check... it seems that last week 2 more unexpected differences have been introduced (ignoring all the version and branch numbers that are ok to diverge).

      So this command:

      git diff MOODLE_310_STABLE master --stat | grep -v version.php | grep -v install/lang | grep -v 'files changed' | cut -d' ' -f2 | xargs git diff MOODLE_310_STABLE master
      

      Is returning these 2 unexpected differences:

      --- a/badges/backpack-add.php
      +++ b/badges/backpack-add.php
      @@ -98,7 +98,7 @@ if (!empty($issuedbadge->recipient->id)) {
                       $assertionid
                   );
       
      -            if (!$assertionentityid && strpos($sitebackpack->backpackapiurl, 'badgr')) {
      +            if ($assertionentityid && strpos($sitebackpack->backpackapiurl, 'badgr')) {
                       $assertionentityid = badges_generate_badgr_open_url(
                           $sitebackpack,
                           OPEN_BADGES_V2_TYPE_ASSERTION,
       
       
      diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
      index 3976d5ffb56..2edf3111bdb 100644
      --- a/lib/db/upgrade.php
      +++ b/lib/db/upgrade.php
      @@ -2911,14 +2911,13 @@ function xmldb_main_upgrade($oldversion) {
                   }
       
                   $dbman->drop_field($table, $field);
      -        }
       
      -        // Main savepoint reached.
      -        upgrade_main_savepoint(true, 2020102300.02);
      +            // Main savepoint reached.
      +            upgrade_main_savepoint(true, 2021052500.33);
      +        }
           }
      

      Worth looking to them, they seem to come from MDL-65959 and MDL-69166, so linking and commenting in both issues.

      Attachments

        1. Screenshot_1.jpg
          Screenshot_1.jpg
          86 kB
        2. Screenshot_2.jpg
          Screenshot_2.jpg
          38 kB
        3. Screenshot_3.jpg
          Screenshot_3.jpg
          67 kB

        Issue Links

          Activity

            People

              peterdias Peter Dias
              stronk7 Eloy Lafuente (stronk7)
              Simey Lameze Simey Lameze
              Jake Dallimore Jake Dallimore
              Janelle Barcega Janelle Barcega
              Yuliya Bozhko, Amaia Anabitarte, Carlos Escobedo, Ferran Recio, Ilya Tregubov, Laurent David, Sara Arjona (@sarjona), Andrew Lyons, Huong Nguyen, Jun Pataleta, Michael Hawkins, Shamim Rezaie, Simey Lameze
              Votes:
              0 Vote for this issue
              Watchers:
              7 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:
                9/Nov/20

                Time Tracking

                  Estimated:
                  Original Estimate - Not Specified
                  Not Specified
                  Remaining:
                  Remaining Estimate - 0 minutes
                  0m
                  Logged:
                  Time Spent - 3 hours, 49 minutes
                  3h 49m