projects
/
Pman.Base
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4dca482
)
php5 support ?
author
Alan Knowles
<alan@roojs.com>
Tue, 1 Dec 2020 06:44:33 +0000
(14:44 +0800)
committer
Alan Knowles
<alan@roojs.com>
Tue, 1 Dec 2020 06:44:33 +0000
(14:44 +0800)
Pman.php
patch
|
blob
|
history
Pman/Roo.php
patch
|
blob
|
history
diff --git
a/Pman.php
b/Pman.php
index
abef5f9
..
a43d1ce
100644
(file)
--- a/
Pman.php
+++ b/
Pman.php
@@
-870,9
+870,12
@@
class Pman extends HTML_FlexyFramework_Page
-
- $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
- usort($files, $lsort);
+ if (PHP_VERSION_ID < 70000 ) {
+ $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
+ usort($files, $lsort);
+ } else {
+ usort($files, function($a,$b) { return strlen($a) > strlen($b) ? 1 : -1; });
+ }
$smod = str_replace('/','.',$mod);
$smod = str_replace('/','.',$mod);
diff --git
a/Pman/Roo.php
b/Pman/Roo.php
index
a173d24
..
4dfffb1
100644
(file)
--- a/
Pman/Roo.php
+++ b/
Pman/Roo.php
@@
-243,11
+243,12
@@
class Pman_Roo extends Pman
// sets map and countWhat
$this->loadMap($x, array(
// sets map and countWhat
$this->loadMap($x, array(
- 'columns' => $_columns,
- 'distinct' => empty($_REQUEST['_distinct']) ? false: $_REQUEST['_distinct'],
- 'exclude' => empty($_REQUEST['_exclude_columns']) ? false: explode(',', $_REQUEST['_exclude_columns'])
+
'columns' => $_columns,
+
'distinct' => empty($_REQUEST['_distinct']) ? false: $_REQUEST['_distinct'],
+
'exclude' => empty($_REQUEST['_exclude_columns']) ? false: explode(',', $_REQUEST['_exclude_columns'])
));
));
-
+
+
$this->setFilters($x,$_REQUEST);
if (!$this->checkPerm($x,'S', $_REQUEST)) {
$this->setFilters($x,$_REQUEST);
if (!$this->checkPerm($x,'S', $_REQUEST)) {