projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'platal-0.9.17'
[platal.git]
/
include
/
userset.inc.php
diff --git
a/include/userset.inc.php
b/include/userset.inc.php
index
0a4a95f
..
f45cf48
100644
(file)
--- a/
include/userset.inc.php
+++ b/
include/userset.inc.php
@@
-19,7
+19,6
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-require_once('xorg.misc.inc.php');
require_once('user.func.inc.php');
global $globals;
require_once('user.func.inc.php');
global $globals;
@@
-321,7
+320,7
@@
class TrombiView extends MultipageView
return 'include/plview.trombi.tpl';
}
return 'include/plview.trombi.tpl';
}
- public function apply(Pl
atal
Page &$page)
+ public function apply(PlPage &$page)
{
if (!empty($GLOBALS['IS_XNET_SITE'])) {
global $globals;
{
if (!empty($GLOBALS['IS_XNET_SITE'])) {
global $globals;
@@
-358,7
+357,7
@@
class GeolocView implements PlView
return $args;
}
return $args;
}
- public function apply(Pl
atal
Page &$page)
+ public function apply(PlPage &$page)
{
require_once 'geoloc.inc.php';
require_once '../modules/search/search.inc.php';
{
require_once 'geoloc.inc.php';
require_once '../modules/search/search.inc.php';
@@
-456,7
+455,7
@@
class GadgetView implements PlView
: "");
}
: "");
}
- public function apply(Pl
atal
Page &$page)
+ public function apply(PlPage &$page)
{
$page->assign_by_ref('set',
$this->set->get($this->fields(), $this->joins(), null, null, null, 5, 0));
{
$page->assign_by_ref('set',
$this->set->get($this->fields(), $this->joins(), null, null, null, 5, 0));