Changeset 1037:20df3c7bdb5c

Timestamp:

11/26/12 13:39:46 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Only main.po (public) locales files are editable by the theme editor plugin, fixes #438 (see also previous revision)

File:

• plugins/themeEditor/class.themeEditor.php (modified) (2 diffs)

plugins/themeEditor/class.themeEditor.php

@@ -243 +243 @@
           foreach ($langs as $k => $v) {
                if ($this->parent_theme) {
-                    $this->po = array_merge($this->po,$this->getFilesInDir($this->parent_theme.'/locales/'.$v,'po',$v.'/'));
-               }
-               $this->po = array_merge($this->po,$this->getFilesInDir($this->user_theme.'/locales/'.$v,'po',$v.'/'));
-          }
-     }
-     
-     protected function getFilesInDir($dir,$ext=null,$prefix='')
+                    $this->po = array_merge($this->po,$this->getFilesInDir($this->parent_theme.'/locales/'.$v,'po',$v.'/','main.po'));
+               }
+               $this->po = array_merge($this->po,$this->getFilesInDir($this->user_theme.'/locales/'.$v,'po',$v.'/','main.po'));
+          }
+     }
+     
+     protected function getFilesInDir($dir,$ext=null,$prefix='',$model=null)
      {
           $dir = path::real($dir);
@@ -261 +261 @@
           {
                if (is_file($dir.'/'.$f) && !preg_match('/^\./',$f) && (!$ext || preg_match('/\.'.preg_quote($ext).'$/i',$f))) {
-                    $res[$prefix.$f] = $dir.'/'.$f;
+                    if (!$model || preg_match('/^'.preg_quote($model).'$/i', $f)) {
+                         $res[$prefix.$f] = $dir.'/'.$f;
+                    }
                }
           }