Index: branches/unlabeled/unlabeled-1.17.2/core/units/groups/groups_config.php
===================================================================
diff -u -r7642 -r7701
--- branches/unlabeled/unlabeled-1.17.2/core/units/groups/groups_config.php (.../groups_config.php) (revision 7642)
+++ branches/unlabeled/unlabeled-1.17.2/core/units/groups/groups_config.php (.../groups_config.php) (revision 7701)
@@ -26,7 +26,7 @@
'TitlePresets' => Array(
'default' => Array( 'new_status_labels' => Array('g' => '!la_title_Adding_Group!'),
'edit_status_labels' => Array('g' => '!la_title_Editing_Group!'),
- 'new_titlefield' => Array('g' => '!la_title_New_Group!'),
+ 'new_titlefield' => Array('g' => ''),
),
'groups_list' => Array('prefixes' => Array('g.total_List'), 'format' => "!la_title_Groups! (#g.total_recordcount#)"),
@@ -102,7 +102,7 @@
'Name' => Array('title' => 'la_col_GroupName'),
),
),
-
+
'Radio' => Array (
'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'),
'Fields' => Array(
@@ -111,7 +111,7 @@
'Description' => Array('title' => 'la_col_Description'),
),
),
-
+
'GroupSelector' => Array (
'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'),
'Fields' => Array(
@@ -121,8 +121,8 @@
),
),
),
-
+
);
?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php
===================================================================
diff -u -r7644 -r7701
--- branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php (.../languages_config.php) (revision 7644)
+++ branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php (.../languages_config.php) (revision 7701)
@@ -72,7 +72,7 @@
'TitlePresets' => Array(
'default' => Array( 'new_status_labels' => Array('lang'=>'!la_title_Adding_Language!'),
'edit_status_labels' => Array('lang'=>'!la_title_Editing_Language!'),
- 'new_titlefield' => Array('lang'=>'!la_title_New_Language!'),
+ 'new_titlefield' => Array('lang'=>''),
),
'languages_list' => Array( 'prefixes' => Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks! (#lang_recordcount#)"),
@@ -96,7 +96,7 @@
'format' => '#emailevents_status# - #emailevents_titlefield#'),
'email_messages_edit' => Array( 'prefixes' => Array('lang','emailmessages'),
- 'new_titlefield' => Array('emailmessages' => '!la_NoSubject!'),
+ 'new_titlefield' => Array('emailmessages' => ''),
'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailmessages_titlefield#'"),
),
Index: branches/unlabeled/unlabeled-1.10.2/core/units/phrases/phrases_config.php
===================================================================
diff -u -r7636 -r7701
--- branches/unlabeled/unlabeled-1.10.2/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 7636)
+++ branches/unlabeled/unlabeled-1.10.2/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 7701)
@@ -53,10 +53,10 @@
'TitlePresets' => Array(
'default' => Array( 'new_status_labels' => Array('phrases'=>'!la_title_Adding_Phrase!'),
'edit_status_labels' => Array('phrases'=>'!la_title_Editing_Phrase!'),
- 'new_titlefield' => Array('phrases'=>'!la_title_New_Phrase!'),
+ 'new_titlefield' => Array('phrases'=>''),
),
- 'phrase_edit' => Array('prefixes' => Array('phrases'), 'format' => '#phrases_status# - #phrases_titlefield#'),
+ 'phrase_edit' => Array('prefixes' => Array('phrases'), 'format' => '#phrases_status# #phrases_titlefield#'),
),
Index: branches/unlabeled/unlabeled-1.23.2/core/kernel/db/dblist.php
===================================================================
diff -u -r7645 -r7701
--- branches/unlabeled/unlabeled-1.23.2/core/kernel/db/dblist.php (.../dblist.php) (revision 7645)
+++ branches/unlabeled/unlabeled-1.23.2/core/kernel/db/dblist.php (.../dblist.php) (revision 7701)
@@ -280,6 +280,22 @@
}
}
+ function GetNoFilterCount()
+ {
+ if (!$this->Counted) {
+ $this->CountRecs();
+ }
+ return $this->NoFilterCount;
+ }
+
+ function GetRecordsCount()
+ {
+ if (!$this->Counted) {
+ $this->CountRecs();
+ }
+ return $this->RecordsCount;
+ }
+
function getCountSQL($sql)
{
if ( preg_match("/DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) )
@@ -604,7 +620,7 @@
$name = $field[0];
$ret .= isset($this->Fields[$name]) && !isset($this->VirtualFields[$name]) ? '`'.$this->TableName.'`.' : '';
-
+
if ($field[0] == 'RAND()' || $field[2]) {
$ret .= $field[0].' '.$field[1].',';
}
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -r7698 -r7701
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/user_edit_password.tpl (.../user_edit_password.tpl) (revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/users/user_edit_password.tpl (.../user_edit_password.tpl) (revision 7701)
@@ -27,7 +27,6 @@