Changeset 2885

Timestamp:

11/19/08 16:46:49 (4 years ago)

Author:

patdenice

Message:

merge -c2884 from trunk to branch 2.0.
- Replace some mysql_query by pwg_query function.
- Add home button after upgrade.php.
- Add utf8 charset for access denied message.
- Replace some #content by .content in css files.
- Fix menubar blocks borders with IE.

Location:

branches/2.0

Files:

• admin/include/functions_upgrade.php (modified) (2 diffs)
• admin/template/goto/upgrade.tpl (modified) (1 diff)
• include/functions_html.inc.php (modified) (1 diff)
• include/functions_session.inc.php (modified) (1 diff)
• install.php (modified) (1 diff)
• install/upgrade_1.3.1.php (modified) (1 diff)
• install/upgrade_1.4.0.php (modified) (1 diff)
• plugins/admin_advices/admin_advices.php (modified) (1 diff)
• template/yoga/default-layout.css (modified) (1 diff)
• template/yoga/theme/Sylvia/images/transparent.gif (copied) (copied from trunk/template/yoga/theme/Sylvia/images/transparent.gif)
• template/yoga/theme/Sylvia/theme.css (modified) (3 diffs)
• upgrade.php (modified) (2 diffs)

branches/2.0/admin/include/functions_upgrade.php

@@ -125 +125 @@
 WHERE id IN ("' . implode('","', $plugins) . '")
 ;';
-    mysql_query($query);
+    pwg_query($query);
 
     array_push($page['infos'],
-      l10n('deactivated plugins').'<br /><br /><i>'.implode(', ', $plugins).'</i><br />');
+      l10n('deactivated plugins').'<p><i>'.implode(', ', $plugins).'</i></p>');
   }
 }
@@ -160 +160 @@
 ;';
   }
-  $row = mysql_fetch_assoc(mysql_query($query));
+  $row = mysql_fetch_assoc(pwg_query($query));
 
   if (!isset($conf['pass_convert']))

branches/2.0/admin/template/goto/upgrade.tpl

@@ -105 +105 @@
   {/foreach}
 </ul>
+
+<form action="index.php" method="post">
+<p><input type="submit" name="submit" value="{'home'|@translate}"/></p>
+</form>
 {/if}
 

branches/2.0/include/functions_html.inc.php

@@ -589 +589 @@
   if ( isset($user) and !is_a_guest() )
   {
+    echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
     echo '<div style="text-align:center;">'.l10n('access_forbiden').'<br />';
     echo '<a href="'.get_root_url().'identification.php">'.l10n('identification').'</a>&nbsp;';

branches/2.0/include/functions_session.inc.php

@@ -147 +147 @@
   VALUES(\''.get_remote_addr_session_hash().$session_id.'\',\''.$data.'\',now())
 ;';
-  mysql_query($query);
+  pwg_query($query);
   return true;
 }

branches/2.0/install.php

@@ -72 +72 @@
           }
         }
-        mysql_query($query);
+        pwg_query($query);
       }
       $query = '';

branches/2.0/install/upgrade_1.3.1.php

@@ -43 +43 @@
   FROM '.PREFIX_TABLE.'config
 ;';
-$save = mysql_fetch_array(mysql_query($query));
+$save = mysql_fetch_array(pwg_query($query));
 
 $queries = array(

branches/2.0/install/upgrade_1.4.0.php

@@ -65 +65 @@
    )
 ;';
-mysql_query($query);
+pwg_query($query);
 
 $queries = array(

branches/2.0/plugins/admin_advices/admin_advices.php

@@ -158 +158 @@
 WHERE image_id =  ' . $row['id'] .'
 ;';
-      $tag_count = mysql_num_rows(mysql_query($query));
+      $tag_count = mysql_num_rows(pwg_query($query));
       $template->assign('thumbnail',
          array(

branches/2.0/template/yoga/default-layout.css

@@ -269 +269 @@
 #theNotificationPage DL,
 #thePopuphelpPage DL { margin: 0 25px 25px; }
-#content #comments UL.thumbnailCategories LI { width:99%; }
+.content #comments UL.thumbnailCategories LI { width:99%; }
 /* jQuery datepicker */
 IMG.ui-datepicker-trigger {

branches/2.0/template/yoga/theme/Sylvia/theme.css

@@ -110 +110 @@
         padding-left: 12px; 
 }
+#menubar LI UL {
+  background: transparent url(images/transparent.gif);
+}
 #menubar A, .menuInfoCat { 
         font-size: 13px; 
@@ -129 +132 @@
         background:transparent url(images/menuId_sides.gif) repeat-y scroll left bottom; 
 }
-#menubar #mbIdentification  .actions, #menubar li ul, #menubar #mbIdentification form  p { 
+#menubar #mbIdentification  .actions, #menubar #mbIdentification form  p { 
         background:transparent none repeat-y scroll left bottom; 
 }
@@ -162 +165 @@
 }
 
-#content { 
+.content { 
         background:#222 url(images/fillet.gif) repeat-x scroll left top; 
         min-height:466px; 

branches/2.0/upgrade.php

@@ -81 +81 @@
 SHOW TABLES
 ;';
-  $result = mysql_query($query);
+  $result = pwg_query($query);
 
   while ($row = mysql_fetch_row($result))
@@ -108 +108 @@
 DESC '.$table.'
 ;';
-    $result = mysql_query($query);
+    $result = pwg_query($query);
 
     $columns_of[$table] = array();