https://bugzilla.wikimedia.org/show_bug.cgi?id=31894

Reedy <[email protected]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |WORKSFORME

--- Comment #1 from Reedy <[email protected]> 2011-10-22 23:54:47 UTC ---
Works fine for me on 5.3.2 and 5.2.4

It seems like you had local modifications, and then svn upping has introduced
something like a merge conflict

Not my fault

See below

Lines 368-298

    /**
     * @param $db
     * @return bool
     */
    function selectDB( $db ) {
        $this->mDBname = $db;
        return mysql_select_db( $db, $this->mConn );
    }

    /**
     * @param $s string
     *
     * @return string
     */
    function strencode( $s ) {
        $sQuoted = mysql_real_escape_string( $s, $this->mConn );

        if($sQuoted === false) {
            $this->ping();
            $sQuoted = mysql_real_escape_string( $s, $this->mConn );
        }
        return $sQuoted;
    }

    /**
     * MySQL uses `backticks` for identifier quoting instead of the sql
standard "double quotes".
     *
     * @param $s string
     *
     * @return string
     */
    public function addIdentifierQuotes( $s ) {
        return "`" . $this->strencode( $s ) . "`";
    }





reedy@ubuntu64-web-esxi:~$ php --version
PHP Warning:  PHP Startup: Unable to load dynamic library
'/usr/lib/php5/20090626/sqlite.so' - /usr/lib/php5/20090626/sqlite.so: cannot
open shared object file: No such file or directory in Unknown on line 0
PHP 5.3.6-13ubuntu3.2 with Suhosin-Patch (cli) (built: Oct 13 2011 23:09:42)
Copyright (c) 1997-2011 The PHP Group
Zend Engine v2.3.0, Copyright (c) 1998-2011 Zend Technologies
    with Xdebug v2.1.0, Copyright (c) 2002-2010, by Derick Rethans
reedy@ubuntu64-web-esxi:~$ wget
http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/db/DatabaseMysql.php?revision=97376&view=co
[1] 12782
--2011-10-23 00:52:28-- 
http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/db/DatabaseMysql.php?revision=97376
Resolving svn.wikimedia.org... 208.80.152.147
Connecting to svn.wikimedia.org|208.80.152.147|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: unspecified [text/plain]
Saving to: `DatabaseMysql.php?revision=97376'

    [<=>                                                                       
                                                    ] 0           --.-K/s      
       DatabaseMysql.php: command not found
    [  <=>                                                                     
                                                    ] 22,076      71.2K/s   in
0.3s

2011-10-23 00:52:29 (71.2 KB/s) - `DatabaseMysql.php?revision=97376' saved
[22076]


[1]+  Done                    wget
http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/db/DatabaseMysql.php?revision=97376
reedy@ubuntu64-web-esxi:~$ ls
DatabaseMysql.php?revision=97376  mbox  mediawiki  test.php
reedy@ubuntu64-web-esxi:~$ php -l DatabaseMysql.php\?revision\=97376
PHP Warning:  PHP Startup: Unable to load dynamic library
'/usr/lib/php5/20090626/sqlite.so' - /usr/lib/php5/20090626/sqlite.so: cannot
open shared object file: No such file or directory in Unknown on line 0
No syntax errors detected in DatabaseMysql.php?revision=97376





reedy@fenari:~$ php --version
PHP 5.2.4-2ubuntu5.12wm1 with Suhosin-Patch 0.9.6.2 (cli) (built: Sep 23 2010
20:36:55)
Copyright (c) 1997-2007 The PHP Group
Zend Engine v2.2.0, Copyright (c) 1998-2007 Zend Technologies
reedy@fenari:~$ wget
http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/db/DatabaseMysql.php?revision=97376&view=co
[1] 27039
reedy@fenari:~$ --23:53:21-- 
http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/db/DatabaseMysql.php?revision=97376
           => `DatabaseMysql.php?revision=97376'
Resolving svn.wikimedia.org... 208.80.152.147
Connecting to svn.wikimedia.org|208.80.152.147|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: unspecified [text/plain]

    [ <=>                                                                      
                                                  ] 22,076        --.--K/s

23:53:22 (430.63 MB/s) - `DatabaseMysql.php?revision=97376' saved [22076]


[1]+  Done                    wget
http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/db/DatabaseMysql.php?revision=97376
reedy@fenari:~$ php -l DatabaseMysql.php\?revision\=97376
No syntax errors detected in DatabaseMysql.php?revision=97376

-- 
Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
You are on the CC list for the bug.

_______________________________________________
Wikibugs-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l

Reply via email to