Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PHPOffice/PHPWord
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: yurii-sio2/PHPWord
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 8, 2018

  1. Fix TemplateProcessor :: fixBrokenMacros; 

    The current regex causes the loss of the original formatting of some documents after the variables have been overwritten.
Replaces the current regex with one that resolves this problem.
New regex from @brainwood
/\$(?:\{|[^{$]*\>\{)[^}$]*\}/U

The brainwood's pull request was rejected due to pipe regex delimiters "|"
    @yurii-sio2
    yurii-sio2 authored Nov 8, 2018
    Configuration menu
    Copy the full SHA
    fb43fa6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from yurii-sio2/fix_TemplateProcessor 

    Fix TemplateProcessor :: fixBrokenMacros;
    @yurii-sio2
    yurii-sio2 authored Nov 8, 2018
    Configuration menu
    Copy the full SHA
    3786fd0 View commit details
    Browse the repository at this point in the history
Loading