Index: trunk/admin/install.php
===================================================================
diff -u -N -r572 -r616
--- trunk/admin/install.php (.../install.php) (revision 572)
+++ trunk/admin/install.php (.../install.php) (revision 616)
@@ -1143,8 +1143,8 @@
if ($state == "finish") {
$ado =& inst_GetADODBConnection();
- $PhraseTable = GetTablePrefix()."ImportPhrases";
- $EventTable = GetTablePrefix()."ImportEvents";
+ $PhraseTable = $g_TablePrefix."ImportPhrases";
+ $EventTable = $g_TablePrefix."ImportEvents";
$ado->Execute("DROP TABLE IF EXISTS $PhraseTable");
$ado->Execute("DROP TABLE IF EXISTS $EventTable");
@@ -1187,15 +1187,15 @@
if (TableExists($ado, "Language,Phrase")) {
$MaxInserts = 200;
- $PhraseTable = GetTablePrefix()."ImportPhrases";
- $EventTable = GetTablePrefix()."ImportEvents";
+ $PhraseTable = $g_TablePrefix."ImportPhrases";
+ $EventTable = $g_TablePrefix."ImportEvents";
- $sql = "CREATE TABLE $PhraseTable SELECT Phrase,Translation,PhraseType,LanguageId FROM ".GetTablePrefix()."Phrase WHERE PhraseId=-1";
+ $sql = "CREATE TABLE $PhraseTable SELECT Phrase,Translation,PhraseType,LanguageId FROM ".$g_TablePrefix."Phrase WHERE PhraseId=-1";
$ado->Execute($sql);
- $sql = "CREATE TABLE $EventTable SELECT Template,MessageType,EventId,LanguageId FROM ".GetTablePrefix()."EmailMessage WHERE EmailMessageId=-1";
+ $sql = "CREATE TABLE $EventTable SELECT Template,MessageType,EventId,LanguageId FROM ".$g_TablePrefix."EmailMessage WHERE EmailMessageId=-1";
$ado->Execute($sql);
- $sql = "SELECT EventId,Event,Type FROM ".GetTablePrefix()."Events";
+ $sql = "SELECT EventId,Event,Type FROM ".$g_TablePrefix."Events";
$rs = $ado->Execute($sql);
$Events = array();
while($rs && !$rs->EOF)
@@ -1316,8 +1316,8 @@
/* do pack install */
$Offset = (int)$_GET["Offset"];
$Status = (int)$_GET["Status"];
- $PhraseTable = GetTablePrefix()."ImportPhrases";
- $EventTable = GetTablePrefix()."ImportEvents";
+ $PhraseTable = $g_TablePrefix."ImportPhrases";
+ $EventTable = $g_TablePrefix."ImportEvents";
if($Status==0)
{
$Total = TableCount($PhraseTable,"",0);
@@ -1363,7 +1363,7 @@
else
{
$db =&GetADODBConnection();
- $prefix = GetTablePrefix();
+ $prefix = $g_TablePrefix;
$db->Execute('DROP TABLE IF EXISTS '.$prefix.'ImportPhrases');
$db->Execute('DROP TABLE IF EXISTS '.$prefix.'ImportEvents');
if( !$force_finish )
Index: trunk/themes/default/misc/right_loggedin.tpl
===================================================================
diff -u -N -r601 -r616
--- trunk/themes/default/misc/right_loggedin.tpl (.../right_loggedin.tpl) (revision 601)
+++ trunk/themes/default/misc/right_loggedin.tpl (.../right_loggedin.tpl) (revision 616)
@@ -51,7 +51,7 @@
|
-
|
+
|
Index: trunk/themes/default/misc/right_login.tpl
===================================================================
diff -u -N -r601 -r616
--- trunk/themes/default/misc/right_login.tpl (.../right_login.tpl) (revision 601)
+++ trunk/themes/default/misc/right_login.tpl (.../right_login.tpl) (revision 616)
@@ -57,16 +57,16 @@
-
- 
+
+
|
-
|
+
|
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.8.sql
===================================================================
diff -u -N -r576 -r616
--- trunk/admin/install/upgrades/inportal_upgrade_v1.0.8.sql (.../inportal_upgrade_v1.0.8.sql) (revision 576)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.8.sql (.../inportal_upgrade_v1.0.8.sql) (revision 616)
@@ -1 +1,4 @@
+UPDATE SearchConfig SET Priority = 2 WHERE FieldName = 'Name' AND TableName = 'Category';
+UPDATE SearchConfig SET Priority = 2 WHERE FieldName = 'Description' AND TableName = 'Category';
+
UPDATE Modules SET Version = '1.0.8' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/admin/install/inportal_data.sql
===================================================================
diff -u -N -r576 -r616
--- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 576)
+++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 616)
@@ -228,8 +228,8 @@
INSERT INTO SearchConfig VALUES ('Category', 'Status', 0, 1, 'lu_fielddesc_category_status', 'lu_field_status', 'In-Portal', 'la_Text_Category', 7, 69, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, 0);
INSERT INTO SearchConfig VALUES ('Category', 'EditorsPick', 0, 1, 'lu_fielddesc_category_editorspick', 'lu_field_editorspick', 'In-Portal', 'la_Text_Category', 6, 68, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, 0);
INSERT INTO SearchConfig VALUES ('Category', 'CreatedOn', 0, 1, 'lu_fielddesc_category_createdon', 'lu_field_createdon', 'In-Portal', 'la_Text_Category', 5, 67, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, 0);
-INSERT INTO SearchConfig VALUES ('Category', 'Description', 1, 1, 'lu_fielddesc_category_description', 'lu_field_description', 'In-Portal', 'la_Text_Category', 4, 66, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, 0);
-INSERT INTO SearchConfig VALUES ('Category', 'Name', 1, 1, 'lu_fielddesc_category_name', 'lu_field_name', 'In-Portal', 'la_Text_Category', 3, 65, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO SearchConfig VALUES ('Category', 'Description', 1, 1, 'lu_fielddesc_category_description', 'lu_field_description', 'In-Portal', 'la_Text_Category', 4, 66, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO SearchConfig VALUES ('Category', 'Name', 1, 1, 'lu_fielddesc_category_name', 'lu_field_name', 'In-Portal', 'la_Text_Category', 3, 65, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, 0);
INSERT INTO SearchConfig VALUES ('Category', 'ParentId', 0, 1, 'lu_fielddesc_category_parentid', 'lu_field_parentid', 'In-Portal', 'la_Text_Category', 2, 64, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, 0);
INSERT INTO SearchConfig VALUES ('Category', 'CategoryId', 0, 1, 'lu_fielddesc_category_categoryid', 'lu_field_categoryid', 'In-Portal', 'la_Text_Category', 0, 62, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, 0);
INSERT INTO SearchConfig VALUES ('Category', 'Modified', 0, 1, 'lu_fielddesc_category_modified', 'lu_field_modified', 'In-Portal', 'la_Text_Category', 20, 82, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, 0);