fisharebest /
webtrees
| @@ 1246-1250 (lines=5) @@ | ||
| 1243 | ||
| 1244 | $this->pending = $new_gedcom; |
|
| 1245 | ||
| 1246 | if (Auth::user()->getPreference('auto_accept')) { |
|
| 1247 | FunctionsImport::acceptAllChanges($this->xref, $this->tree->getTreeId()); |
|
| 1248 | $this->gedcom = $new_gedcom; |
|
| 1249 | $this->pending = null; |
|
| 1250 | } |
|
| 1251 | } |
|
| 1252 | $this->parseFacts(); |
|
| 1253 | } |
|
| @@ 1287-1291 (lines=5) @@ | ||
| 1284 | $this->pending = $gedcom; |
|
| 1285 | ||
| 1286 | // Accept this pending change |
|
| 1287 | if (Auth::user()->getPreference('auto_accept')) { |
|
| 1288 | FunctionsImport::acceptAllChanges($this->xref, $this->tree->getTreeId()); |
|
| 1289 | $this->gedcom = $gedcom; |
|
| 1290 | $this->pending = null; |
|
| 1291 | } |
|
| 1292 | ||
| 1293 | $this->parseFacts(); |
|
| 1294 | ||
