[geeklog-hg] geeklog: Removed the ability to change the path_themes config va...

[geeklog-cvs at lists.geeklog.net]

changeset 9282:cb55a706acab
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/cb55a706acab
user: Tom <websitemaster at cogeco.net>
date: Sat Sep 07 10:09:16 2013 -0400
description:
Removed the ability to change the path_themes config value in the configuration since this also affects the layout_url which never changes

diffstat:

 public_html/docs/english/config.html  |  4 ----
 public_html/docs/japanese/config.html |  4 ----
 public_html/lib-common.php            |  1 -
 sql/updates/mssql_2.0.0_to_2.1.0.php  |  3 +++
 sql/updates/mysql_2.0.0_to_2.1.0.php  |  3 +++
 sql/updates/pgsql_2.0.0_to_2.1.0.php  |  3 +++
 system/classes/config.class.php       |  1 +
 7 files changed, 10 insertions(+), 9 deletions(-)

diffs (89 lines):

diff -r 01081871d05f -r cb55a706acab public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Mon Sep 02 10:22:56 2013 -0400
+++ b/public_html/docs/english/config.html	Sat Sep 07 10:09:16 2013 -0400
@@ -590,10 +590,6 @@
     a custom function <code>CUSTOM_menuEntries</code> (see
     <tt>lib-custom.php</tt> for details).</td></tr>
 <tr>
-  <td valign="top"><a name="desc_path_themes">path_themes</a></td>
-  <td valign="top">/path/to/geeklog/public_html/layout/</td>
-  <td valign="top">Directory where all themes reside</td></tr>
-<tr>
   <td valign="top"><a name="desc_cache_templates">cache_templates</a></td>
   <td valign="top">true</td>
   <td valign="top">If set to <tt>true</tt>, all templates will be cached, which 
diff -r 01081871d05f -r cb55a706acab public_html/docs/japanese/config.html
--- a/public_html/docs/japanese/config.html	Mon Sep 02 10:22:56 2013 -0400
+++ b/public_html/docs/japanese/config.html	Sat Sep 07 10:09:16 2013 -0400
@@ -522,10 +522,6 @@
     <tt>'directory'</tt>（記事一覧）, <tt>'prefs'</tt>（マイアカウント）, <tt>'plugins'</tt>（プラグイン）,
     <tt>'custom'</tt>ï¼ˆã‚«ã‚¹ã‚¿ãƒ ï¼‰ã‚’å¥½ããªæ•°ã ã‘å¥½ããªé †åºã§çµ„ã¿åˆã‚ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚<tt>'plugins'</tt>（プラグイン）は<code>{plg_menu_elements}</code>テンプレート変数と同じで、各プラグインが提供するメニューé 
目です。<tt>'custom'</tt>（カスタム）は<code>CUSTOM_menuEntries</code>カスタム関数が返すメニューé 
目です（詳細は<tt>lib-custom.php</tt>を参ç
§ã—てください。）。</td></tr>
 <tr>
-  <td valign="top"><a name="desc_path_themes">テーマのパス(path_themes)</a></td>
-  <td valign="top">/path/to/geeklog/public_html/layout/</td>
-  <td valign="top">テーマデータのあるディレクトリを指定します。</td></tr>
-<tr>
   <td valign="top"><a name="desc_cache_templates">cache_templates</a></td>
   <td valign="top">true</td>
   <td valign="top">If set to <tt>true</tt>, all templates will be cached, which 
diff -r 01081871d05f -r cb55a706acab public_html/lib-common.php
--- a/public_html/lib-common.php	Mon Sep 02 10:22:56 2013 -0400
+++ b/public_html/lib-common.php	Sat Sep 07 10:09:16 2013 -0400
@@ -286,7 +286,6 @@
 require_once( $_CONF['path_system'] . 'lib-mbyte.php' );
 
 // Set theme
-
 $usetheme = '';
 if( isset( $_POST['usetheme'] ))
 {
diff -r 01081871d05f -r cb55a706acab sql/updates/mssql_2.0.0_to_2.1.0.php
--- a/sql/updates/mssql_2.0.0_to_2.1.0.php	Mon Sep 02 10:22:56 2013 -0400
+++ b/sql/updates/mssql_2.0.0_to_2.1.0.php	Sat Sep 07 10:09:16 2013 -0400
@@ -96,6 +96,9 @@
     // Advanced Editor Options
     $c->add('path_editors','','text',0,3,NULL,132,TRUE, $me, 3);
     $c->add('advanced_editor_name','ckeditor','select',4,20,NULL,845,TRUE, $me, 20);
+    
+    // Remove path_themes (the location of the layout directory since hardcoded now)
+    $c->del('path_themes', 'Core');    
 
     return true;
 }
diff -r 01081871d05f -r cb55a706acab sql/updates/mysql_2.0.0_to_2.1.0.php
--- a/sql/updates/mysql_2.0.0_to_2.1.0.php	Mon Sep 02 10:22:56 2013 -0400
+++ b/sql/updates/mysql_2.0.0_to_2.1.0.php	Sat Sep 07 10:09:16 2013 -0400
@@ -96,6 +96,9 @@
     // Advanced Editor Options
     $c->add('path_editors','','text',0,3,NULL,132,TRUE, $me, 3);
     $c->add('advanced_editor_name','ckeditor','select',4,20,NULL,845,TRUE, $me, 20);
+    
+    // Remove path_themes (the location of the layout directory since hardcoded now)
+    $c->del('path_themes', 'Core');
 
     return true;
 }
diff -r 01081871d05f -r cb55a706acab sql/updates/pgsql_2.0.0_to_2.1.0.php
--- a/sql/updates/pgsql_2.0.0_to_2.1.0.php	Mon Sep 02 10:22:56 2013 -0400
+++ b/sql/updates/pgsql_2.0.0_to_2.1.0.php	Sat Sep 07 10:09:16 2013 -0400
@@ -96,6 +96,9 @@
     // Advanced Editor Options
     $c->add('path_editors','','text',0,3,NULL,132,TRUE, $me, 3);
     $c->add('advanced_editor_name','ckeditor','select',4,20,NULL,845,TRUE, $me, 20);
+    
+    // Remove path_themes (the location of the layout directory since hardcoded now)
+    $c->del('path_themes', 'Core');    
 
     return true;
 }
diff -r 01081871d05f -r cb55a706acab system/classes/config.class.php
--- a/system/classes/config.class.php	Mon Sep 02 10:22:56 2013 -0400
+++ b/system/classes/config.class.php	Sat Sep 07 10:09:16 2013 -0400
@@ -617,6 +617,7 @@
         if ($this->config_array['Core']['allow_user_themes'] == 1 && !empty($_USER['theme'])) {
             $theme = $_USER['theme'];
         }
+        $this->config_array['Core']['path_themes'] =  $this->config_array['Core']['path_html'] . 'layout/'; // Cannot be set by admin anymore
         $this->config_array['Core']['path_layout'] = $this->config_array['Core']['path_themes'] . $theme . '/';
         $this->config_array['Core']['layout_url'] = $this->config_array['Core']['site_url'] . '/layout/' . $theme;
     }