Changeset 1081 in ExiteCMS for trunk/pm.php


Ignore:
Timestamp:
11/07/07 16:57:20 (5 years ago)
Author:
root
Message:

removed empty locale index files
moved some locale settings (charset, country, dateinfo) from $locale to $settings
updated the modules and templates that used these variables

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/pm.php

    r1071 r1081  
    5454            // fix the webmaster to the site's country code 
    5555            if ($msgrec['pmindex_from_id'] == 1) { 
    56                 $data2['cc_flag'] = GeoIP_Code2Flag($locale['country']); 
     56                $data2['cc_flag'] = GeoIP_Code2Flag($settings['country']); 
    5757            } else { 
    5858                $data2['cc_flag'] = GeoIP_IP2Flag($data2['user_ip']); 
     
    8383                // fix the webmaster to the site's country code 
    8484                if ($msgrec['pmindex_to_id'] == 1) { 
    85                     $data2['cc_flag'] = GeoIP_Code2Flag($locale['country']); 
     85                    $data2['cc_flag'] = GeoIP_Code2Flag($settings['country']); 
    8686                } else { 
    8787                    $data2['cc_flag'] = GeoIP_IP2Flag($data2['user_ip']); 
Note: See TracChangeset for help on using the changeset viewer.