[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23435-g90bd765

[Dieter Adriaenssens]

The branch, master has been updated
       via  90bd76540c22cdc1fca5529cf00f7dbc694b6b51 (commit)
      from  4ec5f183b36993ea7a64b7cd28e24f9c7e58099e (commit)


- Log -----------------------------------------------------------------
commit 90bd76540c22cdc1fca5529cf00f7dbc694b6b51
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date:   Thu Nov 24 14:47:45 2011 +0100

    coding style : correct use of includeonce()

-----------------------------------------------------------------------

Summary of changes:
 libraries/core.lib.php |    2 +-
 tbl_indexes.php        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index a27bb17..9587071 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -694,7 +694,7 @@ function PMA_linkURL($url)
         return $url;
     } else {
         if (!function_exists('PMA_generate_common_url')) {
-            require_once('./libraries/url_generating.lib.php');
+            include_once './libraries/url_generating.lib.php';
         }
         $params = array();
         $params['url'] = $url;
diff --git a/tbl_indexes.php b/tbl_indexes.php
index b576e10..195568b 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -125,7 +125,7 @@ if (isset($_REQUEST['do_save_data'])) {
 $GLOBALS['js_include'][] = 'indexes.js';
 require_once './libraries/tbl_info.inc.php';
 if ($GLOBALS['is_ajax_request'] != true) {
-    require_once './libraries/tbl_links.inc.php';
+    include_once './libraries/tbl_links.inc.php';
 }
 
 if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {


hooks/post-receive
-- 
phpMyAdmin