Core and Basic modules are now much more like they should. Huge code clean:

[software/bife/bife-all.git] / modules / album / BIFE / Album / Photo.php

diff --git a/modules/album/BIFE/Album/Photo.php b/modules/album/BIFE/Album/Photo.php
index 15682553e37d5ab9999a974f8aada76fb7181e7e..c99ef29e5c243bda9a9a3c570779e3453f169fac 100644 (file)
--- a/modules/album/BIFE/Album/Photo.php
+++ b/modules/album/BIFE/Album/Photo.php
@@ -39,38 +39,6 @@ require_once 'BIFE/Widget.php';
 class BIFE_Album_Photo extends BIFE_Widget {
     // ~X2C
 
 class BIFE_Album_Photo extends BIFE_Widget {
     // ~X2C
 

-    // +X2C Operation 106
-    /**
-     * Constructor.
-     *
-     * @param  array $attrs Attributes.
-     *
-     * @return void
-     * @access public
-     */
-    function BIFE_Album_Photo($attrs) // ~X2C
-    {
-        $this->__construct($attrs);
-    }
-    // -X2C
-
-    // +X2C Operation 107
-    /**
-     * Constructor.
-     *
-     * @param  array $attrs Attributes.
-     *
-     * @return void
-     * @access public
-     */
-    function __construct($attrs) // ~X2C
-    {
-        $new_attrs['FILE'] = @$attrs['FILE'] ? $attrs['FILE'] : @$_REQUEST['BIFE_ALBUM_FILE'];
-        $new_attrs['DESC'] = @$attrs['DESC'] ? $attrs['DESC'] : basename($new_attrs['FILE']);
-        parent::__construct($new_attrs);
-    }
-    // -X2C
-

     // +X2C Operation 108
     /**
      * Renders the widget using a template returning a string with the results.
     // +X2C Operation 108
     /**
      * Renders the widget using a template returning a string with the results.


@@ -82,9 +50,9 @@ class BIFE_Album_Photo extends BIFE_Widget {
      */
     function render(&$template) // ~X2C
     {
      */
     function render(&$template) // ~X2C
     {

-        $template->setGroup('album');
-        $out = $template->parse('photo', $this->attrs);
-        $template->unsetGroup();
+        $attrs['FILE'] = @$this->attrs['FILE'] ? $this->attrs['FILE'] : @$_REQUEST['BIFE_ALBUM_FILE'];
+        $attrs['DESC'] = @$this->attrs['DESC'] ? $this->attrs['DESC'] : basename($attrs['FILE']);
+        $out = $template->parse('photo', $attrs, '', 'album');

         return $out;
     }
     // -X2C
         return $out;
     }
     // -X2C