Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

196
 
199
 
199
 
language.php
_> 11 <?php
  22 /*
<> 3 -  $Id: language.php 196 2005-09-16 12:59:17Z hpdl $
   3+  $Id: language.php 199 2005-09-22 15:56:13Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
2222 /* Class constructor */
  2323 
  2424     function osC_Language() {
<> 25 -      global $osC_Database, $osC_Session;
   25+      global $osC_Database;
2626 
  2727       $Qlanguages = $osC_Database->query('select * from :table_languages order by sort_order, name');
  2828       $Qlanguages->bindTable(':table_languages', TABLE_LANGUAGES);
     
 !
3939 
  4040       $Qlanguages->freeResult();
  4141 
<> 42 -      if ($osC_Session->exists('language')) {
   42+      if (isset($_SESSION['language'])) {
4343         $this->set();
  4444       } else {
  4545         $this->setToBrowser();
     
 !
4949 /* Public methods */
  5050 
  5151     function set($lang = '') {
<> 52 -      global $osC_Session;
  53 -
  54 -      if (empty($lang) && $osC_Session->exists('language')) {
   52+      if (empty($lang) && isset($_SESSION['language'])) {
5553         foreach ($this->_languages as $l) {
<> 56 -          if ($l['directory'] == $osC_Session->value('language')) {
   54+          if ($l['directory'] == $_SESSION['language']) {
5755             $lang = $l['code'];
  5856             break;
  5957           }
     
 !
7068         tep_setcookie('language', $this->language['code'], time()+60*60*24*90);
  7169       }
  7270 
<> 73 -      if (($osC_Session->exists('language') === false) || ($osC_Session->exists('language') && ($osC_Session->value('language') != $this->language['directory']))) {
  74 -        $osC_Session->set('language', $this->language['directory']);
  75 -        $osC_Session->set('languages_id', $this->language['id']);
   71+      if ((isset($_SESSION['language']) === false) || (isset($_SESSION['language']) && ($_SESSION['language'] != $this->language['directory']))) {
   72+        $_SESSION['language'] = $this->language['directory'];
   73+        $_SESSION['languages_id'] = $this->language['id'];
<_ 7674       }
  7775     }
  7876