Changeset 623 for trunk

Timestamp:

03/15/2011 12:07:50 PM (14 months ago)

Author:

ofer

Message:

Fix bug with editable languages not actually being editable/viewable by translators, as reported by mediopirzel

File:

• trunk/WordPress/plugin/transposh/transposh.php (modified) (3 diffs)

trunk/WordPress/plugin/transposh/transposh.php

@@ -173 +173 @@
         // CHECK TODO!!!!!!!!!!!!
         $this->tgl = transposh_utils::get_language_from_url($_SERVER['REQUEST_URI'], $this->home_url);
-        if (!$this->options->is_viewable_language($this->tgl)) {
+        if (!$this->options->is_viewable_language($this->tgl) && !$this->options->is_editable_language($this->tgl)) {
             $this->tgl = '';
         }
@@ -450 +450 @@
         // TODO TOCHECK!!!!!!!!!!!!!!!!!!!!!!!!!!1
         $this->target_language = $this->tgl;
+        // avoid viewing of editable languages which are not viewable by non translators
+        if (!$this->options->is_viewable_language($this->target_language) &&
+                $this->options->is_editable_language($this->target_language) &&
+                !$this->is_translator()) {
+            $this->target_language = '';
+        }
         if (!$this->target_language)
                 $this->target_language = $this->options->get_default_language();
@@ -1128 +1134 @@
 
         if ($lang || $only_class || $nt_class) {
-            return '<span '.$only_class.$nt_class.$lang.'>' . do_shortcode($content) . '</span>';
+            return '<span ' . $only_class . $nt_class . $lang . '>' . do_shortcode($content) . '</span>';
         } else {
             return do_shortcode($content);