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

Convert wiki intro format during 1.9->2+ restore

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: 2.4
    • Fix Version/s: 2.2.5, 2.3.2
    • Component/s: Wiki (2.x)
    • Labels:
    • Testing Instructions:
      Hide

      1. As admin/teacher, log into a Moodle 1.9 course
      2. Create a course with a wiki.
      3. Save the module and edit the settings
      4. Note the kind of editor used
      5. Backup the course
      6. Restore the course to a 2.x site and open the course
      7. Edit the settings for the wiki
      8. Note the format of the Description editor

      Show
      1. As admin/teacher, log into a Moodle 1.9 course 2. Create a course with a wiki. 3. Save the module and edit the settings 4. Note the kind of editor used 5. Backup the course 6. Restore the course to a 2.x site and open the course 7. Edit the settings for the wiki 8. Note the format of the Description editor
    • Affected Branches:
      MOODLE_24_STABLE
    • Fixed Branches:
      MOODLE_22_STABLE, MOODLE_23_STABLE
    • Pull from Repository:
    • Pull Master Branch:
      MDL-34629-master

      Description

      Same issue as MDL-34586: the intro format isn't converted during a backup/restore scenario. It's also not converted during an upgrade; see MDL-34628.

        Gliffy Diagrams

          Attachments

            Issue Links

              Activity

              Hide
              rajeshtaneja Rajesh Taneja added a comment -

              Code looks great Charles,

              Few minor things you might want to consider, before pushing for integration:

              1. comment not required at https://github.com/mackensen/moodle/compare/MDL-34629-master#L0R138
              2. White spaces https://github.com/mackensen/moodle/compare/MDL-34629-master#L0R178
              3. Comment starts with Capital letter and ends with dot (.) https://github.com/mackensen/moodle/compare/MDL-34629-master#L0R173 (Not so important)
              Show
              rajeshtaneja Rajesh Taneja added a comment - Code looks great Charles, Few minor things you might want to consider, before pushing for integration: comment not required at https://github.com/mackensen/moodle/compare/MDL-34629-master#L0R138 White spaces https://github.com/mackensen/moodle/compare/MDL-34629-master#L0R178 Comment starts with Capital letter and ends with dot (.) https://github.com/mackensen/moodle/compare/MDL-34629-master#L0R173 (Not so important)
              Hide
              cfulton Charles Fulton added a comment -

              Thanks Rajesh, I've fixed up the comment and whitespace (argh, hate when that happens). I thought it best to include a comment for $CFG since it isn't used for a while. I suppose it's self-evident; I may have seen it done that way elsewhere in the codebase.

              Note that I don't the ability to push to integration.

              Show
              cfulton Charles Fulton added a comment - Thanks Rajesh, I've fixed up the comment and whitespace (argh, hate when that happens). I thought it best to include a comment for $CFG since it isn't used for a while. I suppose it's self-evident; I may have seen it done that way elsewhere in the codebase. Note that I don't the ability to push to integration.
              Hide
              rajeshtaneja Rajesh Taneja added a comment -

              Thanks for the quick fix, Charles.

              Pushing it for integration.

              Show
              rajeshtaneja Rajesh Taneja added a comment - Thanks for the quick fix, Charles. Pushing it for integration.
              Hide
              poltawski Dan Poltawski added a comment -

              Hi, this patch is for master, but I assume it only will be useful on 22_STABLE?

              Show
              poltawski Dan Poltawski added a comment - Hi, this patch is for master, but I assume it only will be useful on 22_STABLE?
              Hide
              rajeshtaneja Rajesh Taneja added a comment -

              Hello Dan,

              This is only for 2.x stable. Sorry, I should have commented that.

              Show
              rajeshtaneja Rajesh Taneja added a comment - Hello Dan, This is only for 2.x stable. Sorry, I should have commented that.
              Hide
              cfulton Charles Fulton added a comment -

              No, this is the backup/restore code so we'd want that for 2.3 and 2.4. The upgrade code is split out in MDL-34628.

              Show
              cfulton Charles Fulton added a comment - No, this is the backup/restore code so we'd want that for 2.3 and 2.4. The upgrade code is split out in MDL-34628 .
              Hide
              rajeshtaneja Rajesh Taneja added a comment -

              Aha, sorry got confused with the other one. As I did review the other one as well.

              Show
              rajeshtaneja Rajesh Taneja added a comment - Aha, sorry got confused with the other one. As I did review the other one as well.
              Hide
              rajeshtaneja Rajesh Taneja added a comment -

              Charles, I think this should go on 2.2 as well.

              Show
              rajeshtaneja Rajesh Taneja added a comment - Charles, I think this should go on 2.2 as well.
              Hide
              cfulton Charles Fulton added a comment -

              Oh, definitely in 2.2. I was just making clear we needed it in later versions.

              Show
              cfulton Charles Fulton added a comment - Oh, definitely in 2.2. I was just making clear we needed it in later versions.
              Hide
              poltawski Dan Poltawski added a comment -

              The integration of this issue has been delayed to next week because the integration period is over (Monday, Tuesday) and testing must happen on Wednesday.

              This change to a more rigid timeframe on each integration/testing cycle aims to produce a better and clear separation and organization of tasks for everybody. This is a bulk-automated message, so if you want to blame somebody/thing/where, don't do it here (use git instead) :-D :-P
              Apologies for the inconvenience, this will be integrated next week. Thanks for your collaboration & ciao

              Show
              poltawski Dan Poltawski added a comment - The integration of this issue has been delayed to next week because the integration period is over (Monday, Tuesday) and testing must happen on Wednesday. This change to a more rigid timeframe on each integration/testing cycle aims to produce a better and clear separation and organization of tasks for everybody. This is a bulk-automated message, so if you want to blame somebody/thing/where, don't do it here (use git instead) :-D :-P Apologies for the inconvenience, this will be integrated next week. Thanks for your collaboration & ciao
              Hide
              poltawski Dan Poltawski added a comment -

              Thanks Charles/Raj, i've integrated this now. Cherry-picked to 2.2 and 2.3.

              Show
              poltawski Dan Poltawski added a comment - Thanks Charles/Raj, i've integrated this now. Cherry-picked to 2.2 and 2.3.
              Hide
              timb Tim Barker added a comment -

              Congratulations, the test has passed.

              Show
              timb Tim Barker added a comment - Congratulations, the test has passed.
              Hide
              stronk7 Eloy Lafuente (stronk7) added a comment -

              Fixed STOP Closed STOP Thanks STOP

              Yay, imagination! Ciao

              Show
              stronk7 Eloy Lafuente (stronk7) added a comment - Fixed STOP Closed STOP Thanks STOP Yay, imagination! Ciao

                People

                • Votes:
                  0 Vote for this issue
                  Watchers:
                  0 Start watching this issue

                  Dates

                  • Created:
                    Updated:
                    Resolved:
                    Fix Release Date:
                    10/Sep/12