Skip to content
Snippets Groups Projects
Commit 67f9913d authored by Andreas Gohr's avatar Andreas Gohr
Browse files

removed deprecated PHP4 construct

Assigning the return value of new by reference is deprecated, PHP5's new
automatically assigns by reference
parent 8c5215b7
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
......@@ -20,7 +20,7 @@ class Doku_Handler {
var $rewriteBlocks = true;
function Doku_Handler() {
$this->CallWriter = & new Doku_Handler_CallWriter($this);
$this->CallWriter = new Doku_Handler_CallWriter($this);
}
function _addCall($handler, $args, $pos) {
......@@ -47,7 +47,7 @@ class Doku_Handler {
}
if ( $this->rewriteBlocks ) {
$B = & new Doku_Handler_Block();
$B = new Doku_Handler_Block();
$this->calls = $B->process($this->calls);
}
......@@ -212,7 +212,7 @@ class Doku_Handler {
$this->_footnote = true;
$ReWriter = & new Doku_Handler_Nest($this->CallWriter,'footnote_close');
$ReWriter = new Doku_Handler_Nest($this->CallWriter,'footnote_close');
$this->CallWriter = & $ReWriter;
$this->_addCall('footnote_open', array(), $pos);
break;
......@@ -240,7 +240,7 @@ class Doku_Handler {
function listblock($match, $state, $pos) {
switch ( $state ) {
case DOKU_LEXER_ENTER:
$ReWriter = & new Doku_Handler_List($this->CallWriter);
$ReWriter = new Doku_Handler_List($this->CallWriter);
$this->CallWriter = & $ReWriter;
$this->_addCall('list_open', array($match), $pos);
break;
......@@ -302,7 +302,7 @@ class Doku_Handler {
function preformatted($match, $state, $pos) {
switch ( $state ) {
case DOKU_LEXER_ENTER:
$ReWriter = & new Doku_Handler_Preformatted($this->CallWriter);
$ReWriter = new Doku_Handler_Preformatted($this->CallWriter);
$this->CallWriter = & $ReWriter;
$this->_addCall('preformatted_start',array(), $pos);
break;
......@@ -328,7 +328,7 @@ class Doku_Handler {
switch ( $state ) {
case DOKU_LEXER_ENTER:
$ReWriter = & new Doku_Handler_Quote($this->CallWriter);
$ReWriter = new Doku_Handler_Quote($this->CallWriter);
$this->CallWriter = & $ReWriter;
$this->_addCall('quote_start',array($match), $pos);
break;
......@@ -580,7 +580,7 @@ class Doku_Handler {
case DOKU_LEXER_ENTER:
$ReWriter = & new Doku_Handler_Table($this->CallWriter);
$ReWriter = new Doku_Handler_Table($this->CallWriter);
$this->CallWriter = & $ReWriter;
$this->_addCall('table_start', array(), $pos);
......
......@@ -295,7 +295,7 @@ class Doku_Lexer {
$this->_case = $case;
$this->_regexes = array();
$this->_parser = &$parser;
$this->_mode = &new Doku_LexerStateStack($start);
$this->_mode = new Doku_LexerStateStack($start);
$this->_mode_handlers = array();
}
......
......@@ -61,7 +61,7 @@ class Doku_Parser {
function addBaseMode(& $BaseMode) {
$this->modes['base'] = & $BaseMode;
if ( !$this->Lexer ) {
$this->Lexer = & new Doku_Lexer($this->Handler,'base', true);
$this->Lexer = new Doku_Lexer($this->Handler,'base', true);
}
$this->modes['base']->Lexer = & $this->Lexer;
}
......
......@@ -966,7 +966,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}elseif($ext == 'jpg' || $ext == 'jpeg'){
//try to use the caption from IPTC/EXIF
require_once(DOKU_INC.'inc/JpegMeta.php');
$jpeg =& new JpegMeta(mediaFN($src));
$jpeg =new JpegMeta(mediaFN($src));
if($jpeg !== false) $cap = $jpeg->getTitle();
if($cap){
$title = $this->_xmlEntities($cap);
......
......@@ -204,10 +204,10 @@ function p_get_instructions($text){
$modes = p_get_parsermodes();
// Create the parser
$Parser = & new Doku_Parser();
$Parser = new Doku_Parser();
// Add the Handler
$Parser->Handler = & new Doku_Handler();
$Parser->Handler = new Doku_Handler();
//add modes to parser
foreach($modes as $mode){
......@@ -416,7 +416,7 @@ function p_render_metadata($id, $orig){
}
// set up the renderer
$renderer = & new Doku_Renderer_metadata();
$renderer = new Doku_Renderer_metadata();
$renderer->meta = $orig['current'];
$renderer->persistent = $orig['persistent'];
......@@ -587,7 +587,7 @@ function & p_get_renderer($mode) {
msg("Renderer '$rname' for $mode not valid",-1);
return null;
}
$Renderer = & new $rclass();
$Renderer = new $rclass();
}else{
// Maybe a plugin/component is available?
list($plugin, $component) = $plugin_controller->_splitName($rname);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment