Changeset 29019

Timestamp:

Jul 10, 2014, 12:28:44 PM (10 years ago)

Author:

gbo

Message:

fix issue with automatic Size

Location:

extensions/LLGBO2

Files:

• include/manage_picture_content.php (modified) (5 diffs)
• main.inc.php (modified) (3 diffs)

extensions/LLGBO2/include/manage_picture_content.php

@@ -10 +10 @@
         $template->assign('LLGBO_PATH',LLGBO_PATH);
         include_once(LLGBO_PATH.'/css/sweettitles.css.php');    
-        $conf['LLGBO2']['rendercontent']  = false;
+
         //-----------------------------------------------------------------
         // -----------  add CSS tooltip in footer --------------------
@@ -20 +20 @@
         // Frame is only available on picture extension 
         //-----------------------------------------------------------------
+        unset ($conf['LLGBO2']['rendercontent']); 
          $ext = get_extension($element_info['path']);
          if (!in_array($ext, $conf['picture_ext'])) 
@@ -30 +31 @@
         if ( !empty($content) ) 
                 {        // 2.6 paticular case automatic size management
-                 $autosize_in_place = $template->get_template_vars('is_automatic_size');
-                 $autosize_selected = $template->get_template_vars('automatic_size');
+                 $autosize_on = $template->get_template_vars('is_automatic_size');
+                 if (empty($autosize_on) )
+                                        {return $content;}
+                                        
+                $autosize_type = $template->get_template_vars('automatic_size');
                  unset ($conf['LLGBO2']['PictSizeWH'] );
-                        if ((isset($autosize_in_place))  and  (isset($autosize_selected)) )
-                                {$conf['LLGBO2']['PictSizeWH'] =  $element_info['derivatives'][$autosize_selected]->get_size();
-                                          }
-                else
-                {return $content;}
+                if (isset($autosize_type)) 
+                                {$conf['LLGBO2']['PictSizeWH'] =  $element_info['derivatives'][$autosize_type]->get_size();
+                                         }
                 }
 
@@ -68 +70 @@
                            {$themestyle = 'default';}
                            $frame_end = '';
+                           
                          foreach ($conf['LLGBO2']['FR-sizes'] as  $value) 
                                 {if ( $value > 0)       // boder value > 0      
                                         {       $frame_end = $frame_end.'</div>';}
                                  }
-                           
+                         
                          $template->append('llgbo', array(
                                 'FRAME_END' => $frame_end,
@@ -79 +82 @@
         } // end frame
          // 2.6 paticular case automatic size management
-        if ((isset($autosize_in_place))  and  (isset ($autosize_selected)) )
-                                                {       return $template->parse( 'default_content', true);}
+        if ((isset($autosize_on))  and  (isset ($autosize_type)) )
+                                                { return $template->parse( 'default_content', true);}
                                                 
 } //end --> llgbo_RenderContent

extensions/LLGBO2/main.inc.php

@@ -51 +51 @@
 {
         global $conf;
-        Load_language('plugin.lang', LLGBO_PATH);
+        load_language('plugin.lang', LLGBO_PATH);
                         
         $conf['LLGBO2'] =  safe_unserialize($conf['LLGBO2_Settings']);
@@ -103 +103 @@
                         
         If (($conf['LLGBO2']['frame'])    //Frame
-                 and ($conf['LLGBO2']['rendercontent']) )// $content ok for update
+                 and (!empty($conf['LLGBO2']['rendercontent'])) )// $content ok for update
                 {       $target = 'picture';
                         if ($page['slideshow'] and $conf['light_slideshow'])
@@ -247 +247 @@
         add_event_handler('loc_begin_page_header', 'llgbo_beginheader');
         add_event_handler('loc_end_page_header', 'llgbo_endHeader');
-        Add_event_handler( 'loc_begin_picture','llgbo_BeginPicture');
-        Add_event_handler( 'loc_end_picture', 'llgbo_EndPicture');
+        add_event_handler( 'loc_begin_picture','llgbo_BeginPicture');
+        add_event_handler( 'loc_end_picture', 'llgbo_EndPicture');
         add_event_handler('render_element_content', 'llgbo_RenderContent',  EVENT_HANDLER_PRIORITY_NEUTRAL-1, 20  );
 }