Merge pull request #6991 from jacobbuck/feature/3.6/extend-file-get-url

NEW Add 'updateURL' extension hook to File::getURL()
This commit is contained in:
Damian Mooyman 2017-06-06 21:28:16 +12:00 committed by GitHub
commit 057bfdae79
6 changed files with 9 additions and 7 deletions

View File

@ -32,7 +32,7 @@ class Profiler {
/**
* Initialise the timer. with the current micro time
*/
public function Profiler( $output_enabled=false, $trace_enabled=false)
public function __construct( $output_enabled=false, $trace_enabled=false)
{
$this->description = array();
$this->startTime = array();

View File

@ -719,7 +719,9 @@ class File extends DataObject {
* @return string
*/
public function getURL() {
return Controller::join_links(Director::baseURL(), $this->getFilename());
$url = Controller::join_links(Director::baseURL(), $this->getFilename());
$this->extend('updateURL', $url);
return $url;
}
/**

View File

@ -136,7 +136,7 @@ class SSHTMLBBCodeParser
* @access public
* @author Stijn de Reede <sjr@gmx.co.uk>
*/
public function SSHTMLBBCodeParser($options = array())
public function __construct($options = array())
{
// set the already set options
$baseoptions = &SSHTMLBBCodeParser::getStaticProperty('SSHTMLBBCodeParser', '_options');

View File

@ -13,7 +13,7 @@ class SpellChecker {
*
* @param $config Configuration name/value array.
*/
function SpellChecker(&$config) {
function __construct(&$config) {
$this->_config = $config;
}

View File

@ -29,7 +29,7 @@ class Moxiecode_JSONReader {
var $_location, $_lastLocations;
var $_needProp;
function Moxiecode_JSONReader($data) {
function __construct($data) {
$this->_data = $data;
$this->_len = strlen($data);
$this->_pos = -1;
@ -360,7 +360,7 @@ class Moxiecode_JSONReader {
* @package MCManager.utils
*/
class Moxiecode_JSON {
function Moxiecode_JSON() {
function __construct() {
}
function decode($input) {

View File

@ -31,7 +31,7 @@ class Moxiecode_Logger {
/**
* Constructs a new logger instance.
*/
function Moxiecode_Logger() {
function __construct() {
$this->_path = "";
$this->_filename = "{level}.log";
$this->setMaxSize("100k");