Skip to content

Fix Availability PHP parse error from committed conflict markers - #80

Merged
jasrasr merged 1 commit into
mainfrom
fix/availability-conflict-markers
Sep 17, 2026
Merged

jasrasr merged 1 commit into
mainfrom
fix/availability-conflict-markers

Conversation

@jasrasr

@jasrasr jasrasr commented Sep 17, 2026

Copy link
Copy Markdown
Owner

Problem

Commit 7a21ce1 committed unresolved stash-conflict markers in six Availability files. index.php begins with <<<<<<< Updated upstream on line 2, causing the exact PHP parse error reported on the live site. API PHP, JavaScript, README, changelog and project JSON also contain conflict markers.

Repair

  • Resolve all six files against the current 1.3.0 implementation. Before the version/documentation changes, the resolved files exactly match their contents before the corrupting commit.
  • Preserve optional admin/event passwords, attendee-added date/time options, invite/admin mode separation, one required attendee name, Unicode duplicate matching, and private contacts.
  • Bump the project to 1.3.1 and the app asset URL so browsers request the repaired script.
  • Add GitHub Actions checks for committed conflict markers, PHP syntax, JavaScript syntax, and valid project JSON.
  • Leave unrelated Freshservice changes from the same commit untouched.

Validation

  • PHP syntax passes for both entry points; both JavaScript files parse; project JSON parses; no Availability conflict markers remain.
  • Local page returns HTTP 200 and displays v1.3.1 instead of a parse error.
  • All 73 general API checks pass, including Unicode names, privacy, concurrency and deadlines.
  • Password protection and attendee-added date option suites pass.

Deployment

Merge and allow Hostinger to sync the repaired source. Runtime event data is not modified. The live site repair has not yet been deployed/verified.

@jasrasr
jasrasr merged commit 0bb3d37 into main Sep 17, 2026
1 check passed
@jasrasr
jasrasr deleted the fix/availability-conflict-markers branch September 17, 2026 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant