summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlsces <lester@lsces.co.uk>2016-02-07 17:12:42 +0000
committerlsces <lester@lsces.co.uk>2016-02-07 17:12:42 +0000
commit40b8885cc2b9dac4bab78f3c49f0afeb30e95d9a (patch)
tree3dadfe46468444d7b72cd60e94c8eea519326805
parent16cbbff5cb5791fbcdf297b110fa70bf186ef43e (diff)
downloadinstall-40b8885cc2b9dac4bab78f3c49f0afeb30e95d9a.tar.gz
install-40b8885cc2b9dac4bab78f3c49f0afeb30e95d9a.tar.bz2
install-40b8885cc2b9dac4bab78f3c49f0afeb30e95d9a.zip
Move from Smarty2 to Smarty3 function style
-rw-r--r--get_databases_inc.php2
-rw-r--r--install.php2
-rw-r--r--install_bit_settings.php6
-rw-r--r--install_cleanup.php2
-rw-r--r--install_packages.php2
-rw-r--r--migrate_database.php6
6 files changed, 10 insertions, 10 deletions
diff --git a/get_databases_inc.php b/get_databases_inc.php
index b935407..45dc6e1 100644
--- a/get_databases_inc.php
+++ b/get_databases_inc.php
@@ -50,7 +50,7 @@ if( function_exists( 'fbird_connect' ) ) {
if( function_exists( 'sqlite_open' ) ) {
$dbtodsn['sqlite'] = 'SQLLite';
}
-$gBitSmarty->assign_by_ref('dbservers', $dbtodsn);
+$gBitSmarty->assignByRef('dbservers', $dbtodsn);
$gBitSmarty->assign( 'gBitDbType', $gBitDbType );
$gBitSmarty->assign( 'gBitDbHost', $gBitDbHost );
diff --git a/install.php b/install.php
index 94deace..5997355 100644
--- a/install.php
+++ b/install.php
@@ -139,7 +139,7 @@ $install_file[$i]['name'] = 'Done';
//don't increment last $i since it's used later on
// Needed for version number
-$gBitSmarty->assign_by_ref( 'gBitSystem', $gBitSystem );
+$gBitSmarty->assignByRef( 'gBitSystem', $gBitSystem );
if( !empty( $_POST['signin'] ) ) {
$gBitUser->login( $_POST['user'], $_POST['pass'] );
diff --git a/install_bit_settings.php b/install_bit_settings.php
index ba88243..fa7d8eb 100644
--- a/install_bit_settings.php
+++ b/install_bit_settings.php
@@ -26,7 +26,7 @@ function simple_set_value( $package, $feature ) {
}
// pass all package data to template
-$gBitSmarty->assign_by_ref( 'schema', $gBitInstaller->mPackages );
+$gBitSmarty->assignByRef( 'schema', $gBitInstaller->mPackages );
// settings that aren't just toggles
$formInstallValues = array(
@@ -55,12 +55,12 @@ if( count( $processors ) > 0 ) {
// list of available site styles
$subDirs = array( 'style_info', 'alternate' );
$stylesList = $gBitThemes->getStylesList( NULL, NULL, $subDirs );
-$gBitSmarty->assign_by_ref( "stylesList", $stylesList );
+$gBitSmarty->assignByRef( "stylesList", $stylesList );
// get list of available languages
$languages = array();
$languages = $gBitLanguage->listLanguages();
-$gBitSmarty->assign_by_ref("languages",$languages );
+$gBitSmarty->assignByRef("languages",$languages );
// process form
if( isset( $_REQUEST['bit_settings'] ) ) {
diff --git a/install_cleanup.php b/install_cleanup.php
index a9d0dd8..4846d8a 100644
--- a/install_cleanup.php
+++ b/install_cleanup.php
@@ -10,7 +10,7 @@ $gBitSmarty->assign( 'next_step', $step );
$schema = $gBitInstaller->mPackages;
ksort( $schema );
-$gBitSmarty->assign_by_ref( 'schema', $schema );
+$gBitSmarty->assignByRef( 'schema', $schema );
diff --git a/install_packages.php b/install_packages.php
index f80f77b..92e84a5 100644
--- a/install_packages.php
+++ b/install_packages.php
@@ -25,7 +25,7 @@ $gBitSmarty->assign( 'next_step', $step );
// pass all package data to template
$schema = $gBitInstaller->mPackages;
ksort( $schema );
-$gBitSmarty->assign_by_ref( 'schema', $schema );
+$gBitSmarty->assignByRef( 'schema', $schema );
// confirm that we have all the admin data in the session before proceeding
if( !empty( $_REQUEST['packages'] ) && in_array( 'users', $_REQUEST['packages'] ) && ( empty( $_SESSION['login'] ) || empty( $_SESSION['password'] ) || empty( $_SESSION['email'] ) ) ) {
diff --git a/migrate_database.php b/migrate_database.php
index bcc1e87..ceceb99 100644
--- a/migrate_database.php
+++ b/migrate_database.php
@@ -75,7 +75,7 @@ if (isset($_REQUEST['fSubmitDatabase']) || isset($_REQUEST['fUpdateTables'])) {
$tables_src = $gDb_src->MetaTables();
if (isset($_REQUEST['fUpdateTables'])) {
- $gBitSmarty->assign_by_ref( 'skip_tables', $tables_src );
+ $gBitSmarty->assignByRef( 'skip_tables', $tables_src );
return;
}
@@ -283,8 +283,8 @@ if (isset($_REQUEST['fSubmitDatabase']) || isset($_REQUEST['fUpdateTables'])) {
$results[]= "$table: migrated $q records".(($c > 0) ? "and converted $c blobs" : "");
}
//vd($gDb_dst->mFailed);die;
- $gBitSmarty->assign_by_ref( 'results', $results );
- $gBitSmarty->assign_by_ref( 'errors', $gDb_dst->mFailed );
+ $gBitSmarty->assignByRef( 'results', $results );
+ $gBitSmarty->assignByRef( 'errors', $gDb_dst->mFailed );
$app = "_done";
$gBitSmarty->assign( 'next_step', $step + 1 );