Changeset 3136 for trunk/include/common.inc.php

Timestamp:

Feb 13, 2009, 2:01:03 PM (15 years ago)

Author:

rvelices

Message:

• moved check upgrade feed code to admin/include/functions_upgrade.php
• refactored some code (shorter and somehow faster - but nothing revolutionary)
• decrease lost space in permalinks.tpl and hard coded column width (was illisible)

File:

• trunk/include/common.inc.php (modified) (2 diffs)

trunk/include/common.inc.php

@@ -116 +116 @@
   }
 }
-else
-{
-  if ( strtolower(PWG_CHARSET)!='iso-8859-1' )
-  {
-    fatal_error('PWG supports only iso-8859-1 charset on MySql version '.mysql_get_server_info());
-  }
-}
-
-//
-// Setup gallery wide options, if this fails then we output a CRITICAL_ERROR
-// since basic gallery information is not available
-//
+elseif ( strtolower(PWG_CHARSET)!='iso-8859-1' )
+{
+  fatal_error('PWG supports only iso-8859-1 charset on MySql version '.mysql_get_server_info());
+}
+
 load_conf_from_db();
 load_plugins();
@@ -188 +181 @@
 if ($conf['check_upgrade_feed'])
 {
-
-  // retrieve already applied upgrades
-  $query = '
-SELECT id
-  FROM '.UPGRADE_TABLE.'
-;';
-  $applied = array_from_query($query, 'id');
-
-  // retrieve existing upgrades
-  $existing = get_available_upgrade_ids();
-
-  // which upgrades need to be applied?
-  if (count(array_diff($existing, $applied)) > 0)
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php');
+  if (check_upgrade_feed())
   {
     $header_msgs[] = 'Some database upgrades are missing, '