Changeset 8722 for trunk/plugins

Timestamp:

Jan 17, 2011, 7:48:13 PM (13 years ago)

Author:

plg

Message:

feature 2112 added: ability to set an additional local directory
$conflocal_dir_site in local/config/multisite.inc.php

Location:

trunk/plugins

Files:

• LocalFilesEditor/admin.php (modified) (4 diffs)
• language_switch/language_switch.inc.php (modified) (1 diff)

trunk/plugins/LocalFilesEditor/admin.php

@@ -131 +131 @@
 {
   case 'localconf':
-    $edited_file = PHPWG_ROOT_PATH . "local/config/config.inc.php";
+    $edited_file = PHPWG_ROOT_PATH.PWG_LOCAL_DIR . "config/config.inc.php";
     $content_file = file_exists($edited_file) ?
       file_get_contents($edited_file) : $new_file['localconf'];
@@ -146 +146 @@
     $options[] = l10n('locfiledit_choose_file');
     $options[] = '----------------------';
-    $value = PHPWG_ROOT_PATH . "local/css/rules.css";
+    $value = PHPWG_ROOT_PATH.PWG_LOCAL_DIR . "css/rules.css";
     $options[$value] = 'local / css / rules.css';
     if ($edited_file == $value) $selected = $value;
@@ -153 +153 @@
     foreach (get_dirs($conf['themes_dir']) as $theme_id)
     {
-      $value = PHPWG_ROOT_PATH . 'local/css/'.$theme_id.'-rules.css';
+      $value = PHPWG_ROOT_PATH.PWG_LOCAL_DIR . 'css/'.$theme_id.'-rules.css';
       $options[$value] = 'local / css / '.$theme_id.'-rules.css';
       if ($edited_file == $value) $selected = $value;
@@ -248 +248 @@
     foreach (get_languages() as $language_code => $language_name)
     {
-      $value = PHPWG_ROOT_PATH.'local/language/'.$language_code.'.lang.php';
+      $value = PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'language/'.$language_code.'.lang.php';
       if ($edited_file == $value)
       {

trunk/plugins/language_switch/language_switch.inc.php

@@ -50 +50 @@
     if ( $same !== $user['language']) {
       load_language('common.lang', '', array('language'=>$user['language']) );
-      load_language('lang', PHPWG_ROOT_PATH.'local/',
+      load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR,
         array('language'=>$user['language'], 'no_fallback'=>true, 'local'=>true)
       );