Changeset 2885


Ignore:
Timestamp:
Nov 19, 2008, 4:46:49 PM (15 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:
11 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/2.0/admin/include/functions_upgrade.php

    r2881 r2885  
    125125WHERE id IN ("' . implode('","', $plugins) . '")
    126126;';
    127     mysql_query($query);
     127    pwg_query($query);
    128128
    129129    array_push($page['infos'],
    130       l10n('deactivated plugins').'<br /><br /><i>'.implode(', ', $plugins).'</i><br />');
     130      l10n('deactivated plugins').'<p><i>'.implode(', ', $plugins).'</i></p>');
    131131  }
    132132}
    … …  
    160160;';
    161161  }
    162   $row = mysql_fetch_assoc(mysql_query($query));
     162  $row = mysql_fetch_assoc(pwg_query($query));
    163163
    164164  if (!isset($conf['pass_convert']))

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

    r2864 r2885  
    105105  {/foreach}
    106106</ul>
     107
     108<form action="index.php" method="post">
     109<p><input type="submit" name="submit" value="{'home'|@translate}"/></p>
     110</form>
    107111{/if}
    108112

  • branches/2.0/include/functions_html.inc.php

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

  • branches/2.0/include/functions_session.inc.php

    r2756 r2885  
    147147  VALUES(\''.get_remote_addr_session_hash().$session_id.'\',\''.$data.'\',now())
    148148;';
    149   mysql_query($query);
     149  pwg_query($query);
    150150  return true;
    151151}

  • branches/2.0/install.php

    r2748 r2885  
    7272          }
    7373        }
    74         mysql_query($query);
     74        pwg_query($query);
    7575      }
    7676      $query = '';

  • branches/2.0/install/upgrade_1.3.1.php

    r2864 r2885  
    4343  FROM '.PREFIX_TABLE.'config
    4444;';
    45 $save = mysql_fetch_array(mysql_query($query));
     45$save = mysql_fetch_array(pwg_query($query));
    4646
    4747$queries = array(

  • branches/2.0/install/upgrade_1.4.0.php

    r2339 r2885  
    6565   )
    6666;';
    67 mysql_query($query);
     67pwg_query($query);
    6868
    6969$queries = array(

  • branches/2.0/plugins/admin_advices/admin_advices.php

    r2800 r2885  
    158158WHERE image_id =  ' . $row['id'] .'
    159159;';
    160       $tag_count = mysql_num_rows(mysql_query($query));
     160      $tag_count = mysql_num_rows(pwg_query($query));
    161161      $template->assign('thumbnail',
    162162         array(

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

    r2823 r2885  
    269269#theNotificationPage DL,
    270270#thePopuphelpPage DL { margin: 0 25px 25px; }
    271 #content #comments UL.thumbnailCategories LI { width:99%; }
     271.content #comments UL.thumbnailCategories LI { width:99%; }
    272272/* jQuery datepicker */
    273273IMG.ui-datepicker-trigger {

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

    r2840 r2885  
    110110        padding-left: 12px;
    111111}
     112#menubar LI UL {
     113  background: transparent url(images/transparent.gif);
     114}
    112115#menubar A, .menuInfoCat {
    113116        font-size: 13px;
    … …  
    129132        background:transparent url(images/menuId_sides.gif) repeat-y scroll left bottom;
    130133}
    131 #menubar #mbIdentification  .actions, #menubar li ul, #menubar #mbIdentification form  p {
     134#menubar #mbIdentification  .actions, #menubar #mbIdentification form  p {
    132135        background:transparent none repeat-y scroll left bottom;
    133136}
    … …  
    162165}
    163166
    164 #content {
     167.content {
    165168        background:#222 url(images/fillet.gif) repeat-x scroll left top;
    166169        min-height:466px;

  • branches/2.0/upgrade.php

    r2866 r2885  
    8181SHOW TABLES
    8282;';
    83   $result = mysql_query($query);
     83  $result = pwg_query($query);
    8484
    8585  while ($row = mysql_fetch_row($result))
    … …  
    108108DESC '.$table.'
    109109;';
    110     $result = mysql_query($query);
     110    $result = pwg_query($query);
    111111
    112112    $columns_of[$table] = array();
Note: See TracChangeset for help on using the changeset viewer.