Revision: 136
http://newsphp.svn.sourceforge.net/newsphp/?rev=136&view=rev
Author: christoph_berg
Date: 2007-10-27 03:03:04 -0700 (Sat, 27 Oct 2007)
Log Message:
-----------
Fixed a small error that crept in while SVN file merge
Modified Paths:
--------------
trunk/jasmine/modules/DB/DB.class.php
Modified: trunk/jasmine/modules/DB/DB.class.php
===================================================================
--- trunk/jasmine/modules/DB/DB.class.php 2007-10-27 10:00:56 UTC (rev 135)
+++ trunk/jasmine/modules/DB/DB.class.php 2007-10-27 10:03:04 UTC (rev 136)
@@ -163,15 +163,9 @@
}
}
-<<<<<<< .mine
$stmt =& $this->DB->prepare($sql);
$stmt->execute();
$rows =& $stmt->fetchAll(PDO::FETCH_ASSOC);
-=======
- //$stmt =& $this->m_DB->prepare($sql);
- //$stmt->execute();
- //$rows =& $stmt->fetchAll(PDO::FETCH_ASSOC);
->>>>>>> .r134
return $rows;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
