Changeset 6684

Timestamp:

02/18/2018 02:52:17 PM (8 years ago)

Author:

ocean90

Message:

Rosetta Roles: Move get_parent_project() to the main class.

See #1613.

Location:

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles

Files:

• class-translation-editors-list-table.php (modified) (2 diffs)
• rosetta-roles.php (modified) (1 diff)

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/class-translation-editors-list-table.php

@@ -339 +339 @@
                 foreach ( $project_access_list as $project_id ) {
                         if ( $this->projects[ $project_id ] ) {
-                                $parent = $this->get_parent_project( $this->project_tree, $project_id );
+                                $parent = $this->rosetta_roles->get_parent_project( $this->project_tree, $project_id );
                                 if ( $parent->id != $project_id ) {
                                         $name = sprintf(
@@ -363 +363 @@
                 echo implode( '<br>', $projects );
         }
-
-        /**
-         * Returns the parent project for a sub project.
-         *
-         * @param array $tree The project tree.
-         * @param int $child_id The project tree.
-         * @return object The parent project.
-         */
-        private function get_parent_project( $tree, $child_id ) {
-                $parent = null;
-                foreach ( $tree as $project ) {
-                        if ( $project->id == $child_id ) {
-                                $parent = $project;
-                                break;
-                        }
-
-                        if ( isset( $project->sub_projects ) ) {
-                                $parent = $this->get_parent_project( $project->sub_projects, $child_id );
-                                if ( $parent ) {
-                                        $parent = $project;
-                                        break;
-                                }
-                        }
-                }
-
-                return $parent;
-        }
 }

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/rosetta-roles.php

@@ -745 +745 @@
         }
 
+        /**
+         * Returns the parent project for a sub project.
+         *
+         * @param array $tree The project tree.
+         * @param int $child_id The project tree.
+         * @return object The parent project.
+         */
+        public function get_parent_project( $tree, $child_id ) {
+                $parent = null;
+                foreach ( $tree as $project ) {
+                        if ( $project->id == $child_id ) {
+                                $parent = $project;
+                                break;
+                        }
+
+                        if ( isset( $project->sub_projects ) ) {
+                                $parent = $this->get_parent_project( $project->sub_projects, $child_id );
+                                if ( $parent ) {
+                                        $parent = $project;
+                                        break;
+                                }
+                        }
+                }
+
+                return $parent;
+        }
+
         private function _sort_name_callback( $a, $b ) {
                 return strnatcasecmp( $a->name, $b->name );