Update core/model/modx/sources/modfilemediasource.class.php

See http://tracker.modx.com/issues/8392

The base_url should not be prefixed when you setup a media source relative
added contains/containsnot conditional

It seems not to be possible to write own conditonal modifiers as snippet, so I would like to add them to the core.
Fix same categories on other parent levels. See tracker issue #9052
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  [#9629] Fix notice in xPDOConnection::getOption() when $options not an array
  [#9020] Prevent xPDOZip from attempting to add empty targets
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for xPDO 2.2.6-pl release
  [#7452] Fix sql errors with decimal fields in some locales
  [#9062] Fix problem loading multiple xPDOQuery driver classes
Merge remote-tracking branch 'xpdo/develop' into develop
Merge remote-tracking branch 'xpdo/develop' into develop
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Various documentation corrections
  Fix xPDOIterator->next() using void return value
  Fix undefined constant object in xPDO->toCache()
  Fix xPDO::prepare() sending no driver_options
  Fix xPDO::getInstance() when reusing existing
  Fix invalid call to $this->xpdo->log()
  [#9864] Identify compound PK's properly in xPDOQuery::parseConditions()
  Bump version for 2.2.8-dev
  Update getPK() to look for Schema Version 1.1 indexes first
  Check ob_get_level() at ob_end_* calls where ob wasn't explicitly started
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for 2.2.8-pl release
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Fix xPDOTest::getTableMeta() error (sqlite/sqlsrv)
  Bump version for 2.2.9-dev
  Wrong query statistic counting
  [#10183] Fix cache entry removal on xPDOObject::remove()
xPDO 2.2.9-pl

Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for 2.2.9-pl release
Update code docs, fix invalid constant
Disable phpdoc generation in build for now
Bump version for 2.3.0-alpha development
Add dependency metadata/methods to xPDOTransport

Provides baseline support for dependency metadata to be specified and tested against version constraints
Add changelog entry
Add dependency metadata/API to xPDOTransport

Merge remote-tracking branch 'origin/pr/16' into develop

* origin/pr/16:
  Add changelog entry
  Add dependency metadata/methods to xPDOTransport
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Add changelog entry
  Add dependency metadata/methods to xPDOTransport
  Bump version for 2.3.0-alpha development
  Disable phpdoc generation in build for now
  Update code docs, fix invalid constant
Add modResource::filterPathSegment() static method

Implementation of modResource->cleanAlias moved to this new static method which will be accessible without a modResource instance
Add modX->filterPathSegment() method

Provides easy access to modResource::filterPathSegment() | modResource->cleanAlias()