fixes near versioncontrol_get_backends() calls

marvil07 · Jul 19, 2009 · 69e14ec · 69e14ec
1 parent 17d07b2
commit 69e14ec
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/commit_restrictions/commit_restrictions.module b/commit_restrictions/commit_restrictions.module
@@ -15,7 +15,7 @@
 function commit_restrictions_form_alter(&$form, &$form_state, $form_id) {
   if ($form['#id'] == 'versioncontrol-repository-form') {
     $backends = versioncontrol_get_backends();
-    $backend_capabilities = $backends[$form['#vcs']]['capabilities'];
+    $backend_capabilities = $backends[$form['#vcs']]->capabilities;
     $restrictions = array();
 
     if (isset($form['#repository']) && !empty($form['#repository']['data']['commit_restrictions'])) {

diff --git a/commitlog/commitlog.module b/commitlog/commitlog.module
@@ -1083,7 +1083,7 @@ function theme_commitlog_item($repository, $item, $path_override = NULL, $format
 
   $has_atomic_commits = FALSE;
   $backend = $backends[$repository->vcs];
-  if (in_array(VERSIONCONTROL_CAPABILITY_ATOMIC_COMMITS, $backend['capabilities'])) {
+  if (in_array(VERSIONCONTROL_CAPABILITY_ATOMIC_COMMITS, $backend->capabilities)) {
     $has_atomic_commits = TRUE;
   }
 

diff --git a/includes/VersioncontrolRepository.php b/includes/VersioncontrolRepository.php
@@ -223,7 +223,7 @@ public function update($repository_urls) {
     $backends = versioncontrol_get_backends();
     $vcs = $this->vcs;
     $is_autoadd = in_array(VERSIONCONTROL_FLAG_AUTOADD_REPOSITORIES,
-                           $backends[$vcs]['flags']);
+                           $backends[$vcs]->flags);
     if ($is_autoadd) {
       $table_name = 'versioncontrol_'. $vcs .'_repositories';
       $vcs_specific = $vcs .'_specific';
@@ -273,7 +273,7 @@ public function insert($repository_urls) {
     $backends = versioncontrol_get_backends();
     $vcs = $this->vcs;
     $is_autoadd = in_array(VERSIONCONTROL_FLAG_AUTOADD_REPOSITORIES,
-                           $backends[$vcs]['flags']);
+                           $backends[$vcs]->flags);
     if ($is_autoadd) {
       $table_name = 'versioncontrol_'. $vcs .'_repositories';
       $vcs_specific = $vcs .'_specific';
@@ -363,7 +363,7 @@ public function delete() {
     $backends = versioncontrol_get_backends();
     if (isset($backends[$vcs])) { // not the case when called from uninstall
       $is_autoadd = in_array(VERSIONCONTROL_FLAG_AUTOADD_REPOSITORIES,
-                             $backends[$vcs]['flags']);
+                             $backends[$vcs]->flags);
     }
     if ($is_autoadd) {
       $table_name = 'versioncontrol_'. $vcs .'_repositories';

diff --git a/includes/versioncontrol.rules.inc b/includes/versioncontrol.rules.inc
@@ -30,7 +30,7 @@ function versioncontrol_token_list($type = 'all') {
 
     $vcs_mapping = array();
     foreach (versioncontrol_get_backends() as $vcs => $backend) {
-      $vcs_mapping[$vcs] = check_plain($backend['name']);
+      $vcs_mapping[$vcs] = check_plain($backend->name);
     }
 
     $tokens['versioncontrol repository'] = array(

diff --git a/versioncontrol.admin.inc b/versioncontrol.admin.inc
@@ -568,7 +568,7 @@ function versioncontrol_admin_repository_list(&$form_state) {
   // Construct the form elements for each VCS separately.
   foreach ($repositories_by_backend as $vcs => $vcs_repositories) {
     $header = $header_template;
-    $title = t('@vcs repositories', array('@vcs' => $backends[$vcs]['name']));
+    $title = t('@vcs repositories', array('@vcs' => $backends[$vcs]->name));
     $form[$vcs] = array(
       '#value' => '<h4>'. $title .'</h4>',
     );

diff --git a/versioncontrol.module b/versioncontrol.module
@@ -207,7 +207,7 @@ function versioncontrol_menu() {
   foreach (versioncontrol_get_backends() as $vcs => $backend) {
     $items['admin/project/versioncontrol-repositories/add-'. $vcs] = array(
       'title' => 'Add @vcs repository',
-      'title arguments' => array('@vcs' => $backend['name']),
+      'title arguments' => array('@vcs' => $backend->name),
       'page arguments' => array('versioncontrol_admin_repository_edit',
         VERSIONCONTROL_FORM_CREATE, $vcs
       ),
@@ -369,7 +369,7 @@ function versioncontrol_user_accounts_title_callback($accounts) {
   if (count($vcses) == 1) {
     $backends = versioncontrol_get_backends();
     $vcs = key($vcses);
-    return check_plain($backends[$vcs]['name']);
+    return check_plain($backends[$vcs]->name);
   }
   return t('Repository accounts');
 }
@@ -465,7 +465,7 @@ function versioncontrol_get_backends() {
  */
 function versioncontrol_get_backend($repository) {
   $backends = versioncontrol_get_backends();
-  return $backends[$repository['vcs']];
+  return $backends[$repository->vcs];
 }
 
 /**

diff --git a/versioncontrol.pages.inc b/versioncontrol.pages.inc
@@ -346,7 +346,7 @@ function versioncontrol_account_edit_form(&$form_state, $uid, $repository, $vcs_
   $form = array();
   $create_account = ($vcs_username === VERSIONCONTROL_FORM_CREATE);
   $backends = versioncontrol_get_backends();
-  $vcs_name = $backends[$repository['vcs']]['name'];
+  $vcs_name = $backends[$repository['vcs']]->name;
 
   $user = ($uid === VERSIONCONTROL_REGISTER_DEMO) ? FALSE : user_load($uid);
 

diff --git a/versioncontrol_account_status/versioncontrol_account_status.module b/versioncontrol_account_status/versioncontrol_account_status.module
@@ -404,7 +404,7 @@ function versioncontrol_account_status_versioncontrol_filter_accounts(&$accounts
  */
 function versioncontrol_account_status_form_alter_repository_settings(&$form) {
   $backends = versioncontrol_get_backends();
-  $vcs_name = $backends[$form['#vcs']]['name'];
+  $vcs_name = $backends[$form['#vcs']]->name;
   $repository = empty($form['#repository']) ? FALSE : $form['#repository'];
 
   $form['#versioncontrol_account_status'] = TRUE;