More misc fixes and rewrites (sorry, lame description)

[mailer.git] / inc / libs / country_functions.php

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index fa6694c3dc7533ab8e37c0d188ae8ceb0b7992da..e8f7df36f5d37d505d4554acdc886ab6686b0d91 100644 (file)
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer den Newsletter an die Gaeste     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,15 +38,15 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Generate a human-readable country description with code
 function COUNTRY_GENERATE_INFO ($id) {
        // Load code and description
-       $result = SQL_QUERY_ESC("SELECT code, descr FROM `{!MYSQL_PREFIX!}_countries` WHERE id=%s LIMIT 1",
-               array(bigintval($id)), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT code, descr FROM `{!_MYSQL_PREFIX!}_countries` WHERE `id`=%s LIMIT 1",
+       array(bigintval($id)), __FUNCTION__, __LINE__);
 
        // Is there an entry?
        if (SQL_NUMROWS($result) == 1) {