Changeset 27370 for trunk/include/block.class.php

Timestamp:

Feb 13, 2014, 11:24:06 PM (10 years ago)

Author:

rvelices

Message:

remove prehistoric unnecessary object references

File:

• trunk/include/block.class.php (modified) (6 diffs)

trunk/include/block.class.php

@@ -50 +50 @@
   public function load_registered_blocks()
   {
-    trigger_action('blockmanager_register_blocks', array(&$this));
+    trigger_action('blockmanager_register_blocks', array($this));
   }
   
@@ -72 +72 @@
    * Add a block with the menu. Usually called in 'blockmanager_register_blocks' event.
    *
-   * @param RegisteredBlock &$block
-   */
-  public function register_block(&$block)
+   * @param RegisteredBlock $block
+   */
+  public function register_block($block)
   {
     if (isset($this->registered_blocks[$block->get_id()]))
     {
-      trigger_error("Block '".$block->get_id()."' is already registered", E_USER_WARNING);
       return false;
     }
-    $this->registered_blocks[$block->get_id()] = &$block;
+    $this->registered_blocks[$block->get_id()] = $block;
     return true;
   }
@@ -112 +111 @@
     }
     $this->sort_blocks();
-    trigger_action('blockmanager_prepare_display', array(&$this));
+    trigger_action('blockmanager_prepare_display', array($this));
     $this->sort_blocks();
   }
@@ -141 +140 @@
    *
    * @param string $block_id
-   * @return &DisplayBlock|null
-   */
-  public function &get_block($block_id)
-  {
-    $tmp = null;
+   * @return DisplayBlock|null
+   */
+  public function get_block($block_id)
+  {
     if (isset($this->display_blocks[$block_id]))
     {
       return $this->display_blocks[$block_id];
     }
-    return $tmp;
+    return null;
   }
 
@@ -194 +192 @@
 
     $template->set_filename('menubar', $file);
-    trigger_action('blockmanager_apply', array(&$this) );
+    trigger_action('blockmanager_apply', array($this) );
 
     foreach ($this->display_blocks as $id=>$block)
@@ -280 +278 @@
 
   /**
-   * @param RegisteredBlock &$block
+   * @param RegisteredBlock $block
    */
   public function __construct($block)
   {
-    $this->_registeredBlock = &$block;
-  }
-
-  /**
-   * @return &RegisteredBlock
-   */
-  public function &get_block()
+    $this->_registeredBlock = $block;
+  }
+
+  /**
+   * @return RegisteredBlock
+   */
+  public function get_block()
   {
     return $this->_registeredBlock;