Index: trunk/kernel/include/parseditem.php =================================================================== diff -u -N -r3465 -r3471 --- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 3465) +++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 3471) @@ -1383,6 +1383,19 @@ $this->adodbConnection->Execute($insert); } + function RefreshPage($page_var) + { + global $objConfig, $objSession; + if ( (int)GetVar('lpn') > 0) + { + $this->Page = $_GET['lpn']; + } + elseif ($objConfig->Get($page_var)) + { + $this->Page = $objConfig->Get($page_var); + } + $objSession->SetVariable($page_var, $this->Page); + } function PurgeCatListEditTable() { Index: trunk/admin/listview/listview.php =================================================================== diff -u -N -r3216 -r3471 --- trunk/admin/listview/listview.php (.../listview.php) (revision 3216) +++ trunk/admin/listview/listview.php (.../listview.php) (revision 3471) @@ -373,7 +373,13 @@ { $this->PageURL = $_SERVER["PHP_SELF"]."?env=".BuildEnv(); if(strlen($this->extra_env)) + { $this->PageURL .= "&".$this->extra_env; + } + elseif (GetVar('en') !== false) { + $this->PageURL .= '&en='.(int)GetVar('en'); + } + $this->PageURL .= "&lpn={TargetPage}"; } $cols = $this->ColumnHeaders->Count(); Index: trunk/kernel/include/relationship.php =================================================================== diff -u -N -r701 -r3471 --- trunk/kernel/include/relationship.php (.../relationship.php) (revision 701) +++ trunk/kernel/include/relationship.php (.../relationship.php) (revision 3471) @@ -241,11 +241,12 @@ function clsRelationshipList($CategoryId=-1,$ItemId=-1) { - $this->clsItemCollection(); + global $objConfig; + $this->clsItemCollection(); $this->classname="clsRelationship"; $this->SourceTable = GetTablePrefix()."Relationship"; - $this->Page=1; - $this->PerPage=20; + $this->Page = 1; + $this->PerPage = $objConfig->Get('Perpage_Relations'); // 20; $this->AdminSearchFields = array("ItemName","ItemType","RelationType","Status"); $this->TargetItems = new clsItemCollection(); $this->TargetItems->classname="clsItemDB"; Index: trunk/admin/include/elements.php =================================================================== diff -u -N -r2882 -r3471 --- trunk/admin/include/elements.php (.../elements.php) (revision 2882) +++ trunk/admin/include/elements.php (.../elements.php) (revision 3471) @@ -503,6 +503,8 @@ { global $adminURL; + $url = preg_replace('/^\/(.*)/', '\\1', $url); // remove "/" from beginning + $ToolBar->Add("divider"); if($prev>-1) Index: trunk/kernel/action.php =================================================================== diff -u -N -r3305 -r3471 --- trunk/kernel/action.php (.../action.php) (revision 3305) +++ trunk/kernel/action.php (.../action.php) (revision 3471) @@ -1081,7 +1081,7 @@ $ado = &GetADODBConnection(); $rs = $ado->Execute("SELECT MIN(ReviewId) as MinValue FROM ".$objReviews->SourceTable); $NewId = $rs->fields["MinValue"]-1; - $sql = "UPDATE ".$objReviews->SourceTable." SET ReviewId=".$NewId." WHERE ReviewId=".$r->Get("ReviewId"); + $sql = "UPDATE ".$objReviews->SourceTable." SET ReviewId=".$NewId." WHERE ReviewId=".(int)$r->Get("ReviewId"); if($objSession->HasSystemPermission("DEBUG.LIST")) echo $sql."
\n"; $ado->Execute($sql);