Changeset 1486

Timestamp:

12/22/07 18:01:52 (1 year ago)

Author:

rho

Message:

fixed #236, typo on getting available parents

Signed-off: Rolando Espinoza La fuente <rho@prosoftpeople.com>

Files:

• devel/mod/pages/lib.php (modified) (1 diff)
• devel/mod/pages/lib/pages.inc.php (modified) (2 diffs)

devel/mod/pages/lib.php

@@ -325 +325 @@
-    if (is_array($elements)) {
-        foreach ($elements as $e) {
+            //FIXME: fix parent
+            if ($e->ident == $e->parent) {
+                $e->parent = 0;
+            }
+
-            if ($e->parent == 0) {
-                if (!isset($menu[$e->weight])) {

devel/mod/pages/lib/pages.inc.php

@@ -278 +278 @@
-    $page = get_record('pages', 'uri', $page_name, 'owner', $owner);
-
+    //FIXME: auto correct parent
+    if ($page->ident == $page->parent) {
+        $_page = new StdClass;
+        $_page->ident = $page->ident;
+        $_page->parent = 0;
+        update_record('pages', $_page);
+        unset($_page);
+    }
+
-    if (isset($page->ident) && permissions_check('pages::access', $page->ident) || permissions_check('pages::edit', $owner)) {
-        if (isset($page->content)) {
@@ -470 +479 @@
-
-            if (isset($page->ident)) {
-
-
+
-            } else {
-                //$menu_parents = get_records_sql("SELECT ident,name FROM {$CFG->prefix}pages WHERE parent=?", array(0));
-                $menu_parents = get_records_select('pages', 'parent=? AND owner=?', array(0, $owner));
-            }