- {'Home'|@translate} + {$button_label}
{/if} diff --git a/include/functions.inc.php b/include/functions.inc.php index 52c4d418f..7d8957bd3 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -1512,7 +1512,7 @@ function load_language($filename, $dirname = '', $options = array()) } $dirname .= 'language/'; - $default_language = defined('PHPWG_INSTALLED') ? + $default_language = defined('PHPWG_INSTALLED') and !defined('UPGRADES_PATH') ? get_default_language() : PHPWG_DEFAULT_LANGUAGE; // construct list of potential languages diff --git a/install.php b/install.php index 17c08719c..a78dbe73d 100644 --- a/install.php +++ b/install.php @@ -366,6 +366,7 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment) define('PWG_CHARSET', 'utf-8'); } activate_core_themes(); + activate_core_plugins(); $insert = array( 'id' => 1, diff --git a/install/upgrade_2.5.0.php b/install/upgrade_2.5.0.php index 43125aa0e..32c7c9157 100644 --- a/install/upgrade_2.5.0.php +++ b/install/upgrade_2.5.0.php @@ -121,5 +121,5 @@ echo ''; ob_end_clean(); // now we upgrade from 2.6.0 -// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.6.0.php'); +include_once(PHPWG_ROOT_PATH.'install/upgrade_2.6.0.php'); ?> diff --git a/install/upgrade_2.6.0.php b/install/upgrade_2.6.0.php new file mode 100644 index 000000000..90f13c037 --- /dev/null +++ b/install/upgrade_2.6.0.php @@ -0,0 +1,125 @@ += 140) // TODO change on each release + { + break; + } + + array_push( + $inserts, + array( + 'id' => $upgrade_id, + 'applied' => CURRENT_DATE, + 'description' => '[migration from 2.6.0 to '.PHPWG_VERSION.'] not applied', // TODO change on each release + ) + ); +} + +if (!empty($inserts)) +{ + mass_inserts( + '`'.UPGRADE_TABLE.'`', + array_keys($inserts[0]), + $inserts + ); +} + +// +-----------------------------------------------------------------------+ +// | Perform upgrades | +// +-----------------------------------------------------------------------+ + +ob_start(); +echo '';
+
+for ($upgrade_id = 140; $upgrade_id <= 144; $upgrade_id++) // TODO change on each release
+{
+ if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
+ {
+ continue;
+ }
+
+ // maybe the upgrade task has already been applied in a previous and
+ // incomplete upgrade
+ if (in_array($upgrade_id, $applied))
+ {
+ continue;
+ }
+
+ unset($upgrade_description);
+
+ echo "\n\n";
+ echo '=== upgrade '.$upgrade_id."\n";
+
+ // include & execute upgrade script. Each upgrade script must contain
+ // $upgrade_description variable which describe briefly what the upgrade
+ // script does.
+ include(UPGRADES_PATH.'/'.$upgrade_id.'-database.php');
+
+ // notify upgrade (TODO change on each release)
+ $query = '
+INSERT INTO `'.PREFIX_TABLE.'upgrade`
+ (id, applied, description)
+ VALUES
+ (\''.$upgrade_id.'\', NOW(), \'[migration from 2.6.0 to '.PHPWG_VERSION.'] '.$upgrade_description.'\')
+;';
+ pwg_query($query);
+}
+
+echo '';
+ob_end_clean();
+
+// now we upgrade from 2.7.0
+// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.7.0.php');
+?>
diff --git a/upgrade.php b/upgrade.php
index 4a87cf9d0..5a726fc77 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -138,7 +138,6 @@ function print_time($message)
// +-----------------------------------------------------------------------+
include(PHPWG_ROOT_PATH . 'admin/include/languages.class.php');
$languages = new languages('utf-8');
-
if (isset($_GET['language']))
{
$language = strip_tags($_GET['language']);
@@ -207,7 +206,6 @@ load_language( 'common.lang', '', array('language'=>$language, 'target_charset'=
load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
load_language( 'install.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
load_language( 'upgrade.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
-
// check php version
if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<'))
{
@@ -339,6 +337,10 @@ else if (!in_array('website_url', $columns_of[PREFIX_TABLE.'comments']))
{
$current_release = '2.4.0';
}
+else if (!in_array('nb_available_tags', $columns_of[PREFIX_TABLE.'user_cache']))
+{
+ $current_release = '2.5.0';
+}
else
{
// retrieve already applied upgrades
@@ -348,9 +350,9 @@ SELECT id
;';
$applied_upgrades = array_from_query($query, 'id');
- if (!in_array(139, $applied_upgrades))
+ if (!in_array(144, $applied_upgrades))
{
- $current_release = '2.5.0';
+ $current_release = '2.6.0';
}
else
{
@@ -379,6 +381,10 @@ if ((isset($_POST['submit']) or isset($_GET['now']))
$upgrade_file = PHPWG_ROOT_PATH.'install/upgrade_'.$current_release.'.php';
if (is_file($upgrade_file))
{
+ // reset SQL counters
+ $page['queries_time'] = 0;
+ $page['count_queries'] = 0;
+
$page['upgrade_start'] = get_moment();
$conf['die_on_sql_error'] = false;
include($upgrade_file);
@@ -438,14 +444,6 @@ if ((isset($_POST['submit']) or isset($_GET['now']))
$page['infos_sav'] = $page['infos'];
$page['infos'] = array();
- /* might be usefull when we will have a real integrity checker
- $query = '
-REPLACE INTO '.PLUGINS_TABLE.'
- (id, state)
- VALUES (\'c13y_upgrade\', \'active\')
-;';
- pwg_query($query);*/
-
$query = '
REPLACE INTO '.PLUGINS_TABLE.'
(id, state)
@@ -453,6 +451,41 @@ REPLACE INTO '.PLUGINS_TABLE.'
;';
pwg_query($query);
+ $template->assign(
+ array(
+ 'button_label' => l10n('Home'),
+ 'button_link' => 'index.php',
+ )
+ );
+
+ // if the webmaster has a session, let's give a link to discover new features
+ if (!empty($_SESSION['pwg_uid']))
+ {
+ $version_ = str_replace('.', '_', get_branch_from_version(PHPWG_VERSION).'.0');
+
+ if (file_exists(PHPWG_PLUGINS_PATH .'TakeATour/tours/'.$version_.'/config.inc.php'))
+ {
+ load_language(
+ 'plugin.lang',
+ PHPWG_PLUGINS_PATH.'TakeATour/',
+ array(
+ 'language' => $language,
+ 'force_fallback'=>'en_UK',
+ )
+ );
+
+ // we need the secret key for get_pwg_token()
+ load_conf_from_db();
+
+ $template->assign(
+ array(
+ 'button_label' => l10n('2_7_0_descrp'), // TODO avoid to update it on each release
+ 'button_link' => 'admin.php?submited_tour_path=tours/'.$version_.'&pwg_token='.get_pwg_token(),
+ )
+ );
+ }
+ }
+
// Delete cache data
invalidate_user_cache(true);
$template->delete_compiled_templates();