diff options
| author | tekimaki <will@tekimaki.com> | 2010-07-20 23:18:24 -0400 |
|---|---|---|
| committer | tekimaki <will@tekimaki.com> | 2010-07-20 23:18:24 -0400 |
| commit | 9e877f453ff3efe3341786f5788ee1156e43b91e (patch) | |
| tree | 8c8d062e9aa4a84368bc79bc8b217d0328d6d50f /admin | |
| parent | 7fbb46b81f9e8ecdedb644c197588e5f87fdb4f8 (diff) | |
| parent | 46139f0ed3ef0dd8e4ca71edd0f744b1410d5975 (diff) | |
| download | themes-9e877f453ff3efe3341786f5788ee1156e43b91e.tar.gz themes-9e877f453ff3efe3341786f5788ee1156e43b91e.tar.bz2 themes-9e877f453ff3efe3341786f5788ee1156e43b91e.zip | |
Merge branch 'master' of github.com:bitweaver/themes
Conflicts:
BitThemes.php
smartyplugins/function.biticon.php
merge uses CONFIG_PKG_* constants instead of root constant plus config/
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/schema_inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 744f78d..6f5d975 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -53,8 +53,8 @@ $gBitInstaller->registerPackageInfo( THEMES_PKG_NAME, array( //$gBitInstaller->registerSchemaTable( THEMES_PKG_NAME, '', '', TRUE ); $gBitInstaller->registerPreferences( THEMES_PKG_NAME, array( - array( THEMES_PKG_NAME,'themes_joined_js_css', 'y' ), - array( THEMES_PKG_NAME,'themes_packed_js_css', 'y' ), +// array( THEMES_PKG_NAME,'themes_joined_js_css', 'y' ), +// array( THEMES_PKG_NAME,'themes_packed_js_css', 'y' ), array( THEMES_PKG_NAME,'site_slide_style', DEFAULT_THEME ), array( THEMES_PKG_NAME,'style', DEFAULT_THEME ), array( THEMES_PKG_NAME,'site_style_layout', 'gala_13' ), |