? .svn
? flags
? includes/.svn
? js/.svn
? menu/.svn
? models/.svn
? modules/.svn
? po/.svn
? taxonomy/.svn
Index: localizer.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/localizer/localizer.module,v
retrieving revision 1.9.2.26
diff -u -p -r1.9.2.26 localizer.module
--- localizer.module	21 Jul 2008 07:26:35 -0000	1.9.2.26
+++ localizer.module	25 Jul 2008 02:17:28 -0000
@@ -134,7 +134,7 @@ function localizer_init() {
 if (module_exists('localizer')) {
   function i18n_get_lang() {
     global $user;
-
+    require_once(drupal_get_path('module', 'localizer') .'/includes/localizer.inc');
     if (isset($_SESSION['current_locale'])) {
       localizer_set_language($_SESSION['current_locale']);
     }
@@ -551,9 +551,11 @@ function _localizer_change_language() {
 
   $is_content = false;
   if (arg(0)=='node' && arg(1) && is_numeric(arg(1))) {
-    $content_language = localizernode_get_content_language($_GET['q']);
-    if (localizer_isvalid_language($content_language)) {
-      localizer_set_language($content_language);
+    if (module_exists('localizernode')) {
+      $content_language = localizernode_get_content_language($_GET['q']);
+      if (localizer_isvalid_language($content_language)) {
+        localizer_set_language($content_language);
+      }
     }
     $is_content = true;
   }
Index: localizer_settings.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/localizer/localizer_settings.php,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 localizer_settings.php
--- localizer_settings.php	19 Jul 2008 06:37:20 -0000	1.1.2.6
+++ localizer_settings.php	25 Jul 2008 02:17:28 -0000
@@ -264,7 +264,7 @@ function custom_url_rewrite($type, $path
       $nid = 0;
       if (array_key_exists(1, $arg)) $nid = $arg[1];
       $t_exists = false;
-      if ($nid && is_numeric($nid) && !array_key_exists(2, $arg)) {
+      if (module_exists('localizernode') && $nid && is_numeric($nid) && !array_key_exists(2, $arg)) {
         $r = db_query("SELECT nid FROM {localizernode} WHERE nid=%d and language='%s'", $nid, $current_language);
         if ($r && db_result($r)) {
           $t_exists = true;
Index: includes/localizer.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/localizer/includes/localizer.inc,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 localizer.inc
--- includes/localizer.inc	15 Jul 2008 08:52:07 -0000	1.1.2.6
+++ includes/localizer.inc	25 Jul 2008 02:17:28 -0000
@@ -84,7 +84,7 @@ function localizer_get_localized_path($p
 }
 
 function localizer_exists_localized_content($path, $language) {
-  return localizernode_exists_localized_content($path, $language);
+  return module_exists('localizernode') ? localizernode_exists_localized_content($path, $language) : FALSE;
 }
 
 function localizer_get_content_language($_path) {