PHP7 Project. Commit 4. Removed '&' before some class instantiation

DiscoverAndChange · Jan 22, 2016 · c396757 · c396757
1 parent 1c2286a
commit c396757
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/controllers/C_Document.class.php b/controllers/C_Document.class.php
@@ -348,7 +348,7 @@ function view_action($patient_id="",$doc_id) {
  //pass an empty array because we don't want the documents for each category showing up in this list box
  $rnode = $this->_array_recurse($this->tree->tree,array());
  $menu->addItem($rnode);
- $treeMenu_listbox = &new HTML_TreeMenu_Listbox($menu, array("promoText" => xl('Move Document to Category:')));
+ $treeMenu_listbox = new HTML_TreeMenu_Listbox($menu, array("promoText" => xl('Move Document to Category:')));
 
  $this->assign("tree_html_listbox",$treeMenu_listbox->toHTML());
 
@@ -622,7 +622,7 @@ function queue_action($patient_id="") {
  //pass an empty array because we don't want the documents for each category showing up in this list box
  $rnode = $this->_array_recurse($this->tree->tree,array());
  $menu->addItem($rnode);
- $treeMenu_listbox = &new HTML_TreeMenu_Listbox($menu, array());
+ $treeMenu_listbox = new HTML_TreeMenu_Listbox($menu, array());
 
  $this->assign("tree_html_listbox",$treeMenu_listbox->toHTML());
 
@@ -956,8 +956,8 @@ function list_action($patient_id = "") {
  $menu = new HTML_TreeMenu();
  $rnode = $this->_array_recurse($this->tree->tree,$categories_list);
  $menu->addItem($rnode);
- $treeMenu = &new HTML_TreeMenu_DHTML($menu, array('images' => 'images', 'defaultClass' => 'treeMenuDefault'));
- $treeMenu_listbox = &new HTML_TreeMenu_Listbox($menu, array('linkTarget' => '_self'));
+ $treeMenu = new HTML_TreeMenu_DHTML($menu, array('images' => 'images', 'defaultClass' => 'treeMenuDefault'));
+ $treeMenu_listbox = new HTML_TreeMenu_Listbox($menu, array('linkTarget' => '_self'));
 
  $this->assign("tree_html",$treeMenu->toHTML());
 

diff --git a/controllers/C_DocumentCategory.class.php b/controllers/C_DocumentCategory.class.php
@@ -40,7 +40,7 @@ function list_action() {
  $rnode = $this->_array_recurse($this->tree->tree);
 
  $menu->addItem($rnode);
- $treeMenu = &new HTML_TreeMenu_DHTML($menu, array('images' => 'images', 'defaultClass' => 'treeMenuDefault'));
+ $treeMenu = new HTML_TreeMenu_DHTML($menu, array('images' => 'images', 'defaultClass' => 'treeMenuDefault'));
  $this->assign("tree_html",$treeMenu->toHTML());
 
  return $this->fetch($GLOBALS['template_dir'] . "document_categories/" . $this->template_mod . "_list.html");

diff --git a/controllers/C_Prescription.class.php b/controllers/C_Prescription.class.php
@@ -588,7 +588,7 @@ function multiprint_action($id = "") {
  $this->function_argument_error();
  }
  require_once ($GLOBALS['fileroot'] . "/library/classes/class.ezpdf.php");
- $pdf =& new Cezpdf($GLOBALS['rx_paper_size']);
+ $pdf = new Cezpdf($GLOBALS['rx_paper_size']);
  $pdf->ezSetMargins($GLOBALS['rx_top_margin']
  ,$GLOBALS['rx_bottom_margin']
  ,$GLOBALS['rx_left_margin']
@@ -723,7 +723,7 @@ function send_action_process($id) {
 
  function _print_prescription($p, & $toFile) {
  require_once ($GLOBALS['fileroot'] . "/library/classes/class.ezpdf.php");
- $pdf =& new Cezpdf($GLOBALS['rx_paper_size']);
+ $pdf = new Cezpdf($GLOBALS['rx_paper_size']);
  $pdf->ezSetMargins($GLOBALS['rx_top_margin']
  ,$GLOBALS['rx_bottom_margin']
  ,$GLOBALS['rx_left_margin']
@@ -761,7 +761,7 @@ function _print_prescription_css($p, & $toFile) {
 
  function _print_prescription_old($p, & $toFile) {
  require_once ($GLOBALS['fileroot'] . "/library/classes/class.ezpdf.php");
- $pdf =& new Cezpdf($GLOBALS['rx_paper_size']);
+ $pdf = new Cezpdf($GLOBALS['rx_paper_size']);
  $pdf->ezSetMargins($GLOBALS['rx_top_margin']
  ,$GLOBALS['rx_bottom_margin']
  ,$GLOBALS['rx_left_margin']