diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-09-21 01:09:18 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-21 01:09:18 +0200 |
| commit | fab0ec64b383c672e91db8524a225671795d4805 (patch) | |
| tree | 4a21e36d8b30119d128669e77b18277ca006fa63 /phpBB/adm | |
| parent | 207f2495211fab0400a9f005bc9c307a3f51d335 (diff) | |
| parent | 7b7a56dc4a5f70f8e7ced66fef210e9591bbd929 (diff) | |
| download | forums-fab0ec64b383c672e91db8524a225671795d4805.tar forums-fab0ec64b383c672e91db8524a225671795d4805.tar.gz forums-fab0ec64b383c672e91db8524a225671795d4805.tar.bz2 forums-fab0ec64b383c672e91db8524a225671795d4805.tar.xz forums-fab0ec64b383c672e91db8524a225671795d4805.zip | |
Merge remote-tracking branch 'github-cs278/feature/remove-db-styles' into develop
* github-cs278/feature/remove-db-styles:
[feature/remove-db-styles] Remove forgotten template variables.
[feature/remove-db-styles] Removed style.php!
[feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
[feature/remove-db-styles] Update language to reflect removal of db storage.
[feature/remove-db-styles] Mark log entrys as deprecated.
[feature/remove-db-styles] Add error if template/theme file is unwritable.
[feature/remove-db-styles] Add schema changes sinces 3.0.x.
[feature/remove-db-styles] Readd table constant for upgrades etc.
[feature/remove-db-styles] Update database schemas.
[feature/remove-db-styles] Remove style.php DB storage.
[feature/remove-db-styles] Remove parse_css_file option from themes.
[feature/remove-db-styles] Remove DB theme handling code from session.
[feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
[feature/remove-db-styles] Missed a few template DB bits in acp_styles.
[feature/remove-db-styles] Removing unused methods from acp_style.
[feature/remove-db-styles] Removed database storage of style components.
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/index.php | 3 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 2444a1b597..4f4d9ccedd 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -56,9 +56,6 @@ $template->set_custom_template($phpbb_admin_path . 'style', 'admin'); $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); -// the acp template is never stored in the database -$user->theme['template_storedb'] = false; - // Instantiate new module $module = new p_master(); diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index d503f323e0..4076cf1ba6 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -362,13 +362,6 @@ <dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd> </dl> <!-- ENDIF --> - <!-- IF (S_TEMPLATE or S_THEME) and (S_LOCATION or not S_INSTALL) --> - <dl> - <dt><label for="store_db">{L_LOCATION}:</label><br /><span><!-- IF S_STORE_DB_DISABLED -->{L_LOCATION_DISABLED_EXPLAIN}<!-- ELSE -->{L_LOCATION_EXPLAIN}<!-- ENDIF --></span></dt> - <dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF --> /> {L_STORE_FILESYSTEM}</label> - <label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF -->/> {L_STORE_DATABASE}</label></dd> - </dl> - <!-- ENDIF --> <!-- IF S_STYLE --> </fieldset> |