fix broken logic in CRM_Utils_System_DrupalBase::formatResourceUrl()

[mfb]

CRM_Utils_System_DrupalBase::formatResourceUrl() formats CSS or JS URLs to be passed to the CMS for aggregation.

It works fine for the most part, but has some broken logic when an absolute URL containing the $base_url is passed in (for example, from shoreditch extension).

Before

The URL path is checked via file_exists() to see if it's an internal file. Query string is stripped off later in the function. However, this check will always fail unless the query string is stripped off first. In addition, the path being checked is missing a slash between DRUPAL_ROOT and the path, so again the check will always fail. This results in the resource not being aggregated even though it could.

After

Strip off the query string and add the missing slash. If file is found, we set the $url reference. Resource aggregation works.

Comments

You might be wondering why there is a query string passed, which is then stripped off. This is because CRM_Core_Resources::addCacheCode() adds a cache-busting query string. It gets stripped off in favor of doing CSS/JS aggregation.

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[seamuslee001]

Jenkins re test this please

[MegaphoneJon]

I replicated this bug, then ran this code and reviewed the code to ensure it does what's expected. Everything looks good.

In theory this could have a test, but it relies on the DRUPAL_ROOT constant. I'm not sure if it's kosher to assume the test suite is running on Drupal.

[seamuslee001]

I'm going to merge this based on Jon's testing

[eileenmcnaughton]

@mfb @MegaphoneJon we are seeing reports of " "Incorrect Resource URLs" after upgrading to 5.13.5 (we skipped 5.13.4)."

I think it's to do with changing the presence or otherwise of the trailing slash & then the comparison not picking that up

[eileenmcnaughton]

Changed my mind - git blame lies elsewhere - it's the guzzle timeout being too aggressive