Changeset 17519 for extensions/UserCollections/include

Timestamp:

Aug 9, 2012, 10:48:01 PM (12 years ago)

Author:

mistic100

Message:

clean definition of USER_COLLEC_PUBLIC
missing one template var for themes compatibility

Location:

extensions/UserCollections/include

Files:

• UserCollection.class.php (modified) (1 diff)
• collections.inc.php (modified) (1 diff)
• events.inc.php (modified) (2 diffs)

extensions/UserCollections/include/UserCollection.class.php

@@ -292 +292 @@
       'PUBLIC' => (bool)$this->data['public'],
       'DATE_CREATION' => format_date($this->data['date_creation'], true),
-      'U_PUBLIC' => get_absolute_root_url().'collection/view/'.$this->data['public_id'],
+      'U_PUBLIC' => USER_COLLEC_PUBLIC . 'view/'.$this->data['public_id'],
       'IS_TEMP' =>  $this->data['name'] == 'temp',
       );

extensions/UserCollections/include/collections.inc.php

@@ -289 +289 @@
 }
 
-$template->assign('USER_COLLEC_PATH', USER_COLLEC_PATH);
+$template->assign(array(
+  'USER_COLLEC_PATH' => USER_COLLEC_PATH,
+  'USER_COLLEC_ABS_PATH' => realpath(USER_COLLEC_PATH).'/',
+  ));
 
 

extensions/UserCollections/include/events.inc.php

@@ -15 +15 @@
 {
   global $tokens, $page, $conf;
-  
-  define('USER_COLLEC_PUBLIC', make_index_url(array('section' => 'collections')) . '/');
 
   if ($tokens[0] == 'collections')
@@ -204 +202 @@
   $max = 6;
   
-  if (!defined('USER_COLLEC_PUBLIC')) define('USER_COLLEC_PUBLIC', make_index_url(array('section' => 'collections')) . '/');
-  
   global $template, $conf, $user, $UserCollection;
   $menu = &$menu_ref_arr[0];