Skip to content

Commit

Permalink
Merge branch 'release-10.4.0' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
DominicWatson committed Dec 17, 2015
2 parents 0aa8fd1 + f8413f6 commit 134e11c
Show file tree
Hide file tree
Showing 171 changed files with 6,509 additions and 364 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ echo "Running tests (please be patient, expect this to take several minutes)..."
echo "";


./test.sh
./test.sh || exit 1;

if [[ $TRAVIS_PULL_REQUEST == 'true' ]] ; then
echo "Finished. (not packaging up docs or source due to running in a pull request)."
Expand Down
2 changes: 1 addition & 1 deletion support/build/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ build.number.remote.url=http://downloads.presidecms.com/presidecms/build.number

##############################
# MANUALLY UPDATE EACH VERSION
preside.version=10.3.6
preside.version=10.4.0
##############################
12 changes: 12 additions & 0 deletions support/docs/docs/02.devguides/18.presidesuperclass/page.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,26 @@ PresideCMS comes with its own suite of service objects that you can use in your
* @presideService
*/
component {
function init() {
return this;
}
// ...
}
// or
component presideService {
function init() {
return this;
}
// ...
}
```

>>> Service CFCs that declare themselves as Preside Services **must** implement an `init()` method, even if it does nothing but `return this;`.
Once your service has been flagged as being a "Preside Service", it will instantly have a number of core methods available to it such as `$getPresideObject()` and `$isFeatureEnabled()`. e.g.

```luceescript
Expand Down

0 comments on commit 134e11c

Please sign in to comment.