Commit Graph

12 Commits

Author SHA1 Message Date
Daniel Hensby
c754882e0a
Merge branch '3.3' into 3.4 2016-08-23 10:58:24 +01:00
Daniel Hensby
3820a26abd
Simplifying ModelAsControllerTest setUp 2016-08-22 19:41:11 +01:00
Sam Minnee
bbc3aaaf9f MINOR: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:32:05 +13:00
Damian Mooyman
f2efbefb8c Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	.travis.yml
2015-09-09 14:09:00 +12:00
Stephen Shkardoon
b87f5473d9 MINOR Change how OldPageRedirector gets URLs to fix nested redirects
Previously, we would be limited by the way allParams will return 3 parameters
 at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
2015-08-21 00:29:37 +12:00
Ingo Schommer
6403be518a Backwards compat OldPageRedirector
Regression from f972466880.
Passes tests in 3.1, but fails in master due to Deprecation notices.
Tests needed adjustments because OldPageRedirector::find_old_page()
doesn't have the same method signature...
2013-12-06 14:28:08 +01:00
Ingo Schommer
51c8e8639e API Marked statics private, use Config API instead (#8317)
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:21:04 +01:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
carlos barberis
f7b6f1de5a BUGFIX: ticket #5239 - Infinite loop: live subpage of draft page redirects onto itself when called just by url segment 2012-07-23 17:06:37 +12:00
Simon Welsh
b8e86ae261 MINOR Add newline to end of files without one 2012-04-15 10:56:40 +12:00
Ingo Schommer
f547da23a3 MINOR Relative $fixture_file links in cms/tests to facilitate moving files 2011-03-30 20:04:31 +13:00
Ingo Schommer
60abe5fb9f MINOR Moved files into a more logical structure in cms/code 2011-03-30 20:03:44 +13:00