Skip to content

Commit 67a2a05

Browse files
deadbeef84deadbeef84
committed
Release 1.12.10
1 parent 60f21c7 commit 67a2a05

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+125
-121
lines changed

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2005-2014, Zend Technologies USA, Inc.
1+
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

‎library/Zend/Db.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @category Zend
1717
* @package Zend_Db
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -26,7 +26,7 @@
2626
*
2727
* @category Zend
2828
* @package Zend_Db
29-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
29+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3030
* @license http://framework.zend.com/license/new-bsd New BSD License
3131
*/
3232
class Zend_Db

‎library/Zend/Db/Adapter/Abstract.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Db
1717
* @subpackage Adapter
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -37,7 +37,7 @@
3737
* @category Zend
3838
* @package Zend_Db
3939
* @subpackage Adapter
40-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
40+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
4141
* @license http://framework.zend.com/license/new-bsd New BSD License
4242
*/
4343
abstract class Zend_Db_Adapter_Abstract
@@ -930,13 +930,7 @@ public function quoteInto($text, $value, $type = null, $count = null)
930930
if ($count === null) {
931931
return str_replace('?', $this->quote($value, $type), $text);
932932
} else {
933-
while ($count > 0) {
934-
if (strpos($text, '?') !== false) {
935-
$text = substr_replace($text, $this->quote($value, $type), strpos($text, '?'), 1);
936-
}
937-
--$count;
938-
}
939-
return $text;
933+
return implode($this->quote($value, $type), explode('?', $text, $count + 1));
940934
}
941935
}
942936

‎library/Zend/Db/Adapter/Db2.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Db
1717
* @subpackage Adapter
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*
@@ -39,7 +39,7 @@
3939

4040
/**
4141
* @package Zend_Db
42-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
42+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
4343
* @license http://framework.zend.com/license/new-bsd New BSD License
4444
*/
4545

‎library/Zend/Db/Adapter/Db2/Exception.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Db
1717
* @subpackage Adapter
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -30,7 +30,7 @@
3030
*
3131
* @package Zend_Db
3232
* @subpackage Adapter
33-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3434
* @license http://framework.zend.com/license/new-bsd New BSD License
3535
*/
3636
class Zend_Db_Adapter_Db2_Exception extends Zend_Db_Adapter_Exception

‎library/Zend/Db/Adapter/Exception.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Db
1717
* @subpackage Adapter
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Db
3131
* @subpackage Adapter
32-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
class Zend_Db_Adapter_Exception extends Zend_Db_Exception

‎library/Zend/Db/Adapter/Mysqli.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Db
1717
* @subpackage Adapter
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -46,7 +46,7 @@
4646
* @category Zend
4747
* @package Zend_Db
4848
* @subpackage Adapter
49-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
49+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
5050
* @license http://framework.zend.com/license/new-bsd New BSD License
5151
*/
5252
class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract

‎library/Zend/Db/Adapter/Mysqli/Exception.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Db
1717
* @subpackage Adapter
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*
@@ -32,7 +32,7 @@
3232
* @category Zend
3333
* @package Zend_Db
3434
* @subpackage Adapter
35-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
35+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3636
* @license http://framework.zend.com/license/new-bsd New BSD License
3737
*/
3838
class Zend_Db_Adapter_Mysqli_Exception extends Zend_Db_Adapter_Exception

‎library/Zend/Db/Adapter/Oracle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Db
1717
* @subpackage Adapter
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -34,7 +34,7 @@
3434
* @category Zend
3535
* @package Zend_Db
3636
* @subpackage Adapter
37-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
37+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3838
* @license http://framework.zend.com/license/new-bsd New BSD License
3939
*/
4040
class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract

‎library/Zend/Db/Adapter/Oracle/Exception.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Db
1717
* @subpackage Adapter
18-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
* @version $Id$
2121
*/
@@ -31,7 +31,7 @@
3131
* @category Zend
3232
* @package Zend_Db
3333
* @subpackage Adapter
34-
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
34+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
3535
* @license http://framework.zend.com/license/new-bsd New BSD License
3636
*/
3737
class Zend_Db_Adapter_Oracle_Exception extends Zend_Db_Adapter_Exception

0 commit comments

Comments
 (0)