tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 05:39:10 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/Profiler.php
View File

@ -32,7 +32,7 @@ class Profiler {
/** /**
* Initialise the timer. with the current micro time * 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->description = array();
$this->startTime = array(); $this->startTime = array();

4
filesystem/File.php
View File

@ -719,7 +719,9 @@ class File extends DataObject {
* @return string * @return string
*/ */
public function getURL() { 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;
} }
/** /**

2
parsers/HTML/HTMLBBCodeParser.php
View File

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

2
thirdparty/tinymce-spellchecker/classes/SpellChecker.php vendored
View File

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

4
thirdparty/tinymce-spellchecker/classes/utils/JSON.php vendored
View File

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

2
thirdparty/tinymce-spellchecker/classes/utils/Logger.php vendored
View File

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