Changeset 1048

Timestamp:

Feb 20, 2006, 11:14:24 PM (18 years ago)

Author:

plg

Message:

request 290: replace function get_themes name to avoid redeclaration from
Wordpress in jillij template.

Location:

trunk

Files:

• admin/configuration.php (modified) (1 diff)
• admin/include/functions.php (modified) (2 diffs)
• admin/user_list.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)

trunk/admin/configuration.php

@@ -254 +254 @@
     $blockname = 'default.template_option';
 
-    foreach (get_themes() as $pwg_template)
+    foreach (get_pwg_themes() as $pwg_template)
     {
       if (isset($_POST['submit']))

trunk/admin/include/functions.php

@@ -1317 +1317 @@
 function update_average_rate( $element_id=-1 )
 {
-  $average_rates = array();
-  
   $query = '
 SELECT element_id,
@@ -1330 +1328 @@
   
   $result = pwg_query($query);
+
+  $datas = array();
+  
   while ($row = mysql_fetch_array($result))
-  {
-    array_push($average_rates, $row);
-  }
-
-  $datas = array();
-  foreach ($average_rates as $item)
   {
     array_push(
       $datas,
       array(
-        'id' => $item['element_id'],
-        'average_rate' => $item['average_rate']
+        'id' => $row['element_id'],
+        'average_rate' => $row['average_rate']
         )
       );
   }
-  $fields = array('primary' => array('id'), 'update' => array('average_rate'));
-  mass_updates(IMAGES_TABLE, $fields, $datas);
+  
+  mass_updates(
+    IMAGES_TABLE,
+    array(
+      'primary' => array('id'),
+      'update' => array('average_rate')
+      ),
+    $datas
+    );
 
   $query='

trunk/admin/user_list.php

@@ -592 +592 @@
 $blockname = 'template_option';
 
-foreach (get_themes() as $pwg_template)
+foreach (get_pwg_themes() as $pwg_template)
 {
   if (isset($_POST['pref_submit']))

trunk/include/functions.inc.php

@@ -547 +547 @@
 
 /**
- * returns available templates/themes
- */
-function get_templates()
-{
-  return get_dirs(PHPWG_ROOT_PATH.'theme');
-}
-function get_themes()
+ * returns available template/theme
+ */
+function get_pwg_themes()
 {
   $themes = array();
 
-  foreach (get_dirs(PHPWG_ROOT_PATH.'template') as $template)
-  {
-    foreach (get_dirs(PHPWG_ROOT_PATH.'template/'.$template.'/theme') as $theme)
+  $template_dir = PHPWG_ROOT_PATH.'template';
+  
+  foreach (get_dirs($template_dir) as $template)
+  {
+    foreach (get_dirs($template_dir.'/'.$template.'/theme') as $theme)
     {
       array_push($themes, $template.'/'.$theme);